[Xcb-commit] Branch 'xspec' - 3 commits - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Mon Mar 6 03:10:04 PST 2006
xcb-proto/src/extensions/bigreq.xml | 7
xcb-proto/src/extensions/composite.xml | 52
xcb-proto/src/extensions/damage.xml | 62
xcb-proto/src/extensions/dpms.xml | 45
xcb-proto/src/extensions/glx.xml | 2488 ++++++++++++++-----------------
xcb-proto/src/extensions/randr.xml | 217 +-
xcb-proto/src/extensions/record.xml | 279 +--
xcb-proto/src/extensions/render.xml | 813 ++++------
xcb-proto/src/extensions/res.xml | 97 -
xcb-proto/src/extensions/screensaver.xml | 81 -
xcb-proto/src/extensions/shape.xml | 153 -
xcb-proto/src/extensions/shm.xml | 108 -
xcb-proto/src/extensions/sync.xml | 180 --
xcb-proto/src/extensions/xc_misc.xml | 28
xcb-proto/src/extensions/xevie.xml | 55
xcb-proto/src/extensions/xf86dri.xml | 262 +--
xcb-proto/src/extensions/xfixes.xml | 352 ++--
xcb-proto/src/extensions/xprint.xml | 582 +++----
xcb-proto/src/extensions/xv.xml | 750 ++++-----
xcb-proto/src/extensions/xvmc.xml | 211 +-
xcb-proto/src/xcb_types.xml | 263 +--
xcb-proto/src/xproto.xml | 2001 +++++++++++-------------
22 files changed, 4316 insertions(+), 4770 deletions(-)
New commits:
diff-tree 1bf0d79257d2cc4eb8e0b8a74ce8c26b55aae90d (from 33779ba105cf476685048c224e201fd901d6ca02)
Author: Alp Toker <alp at atoker.com>
Date: Mon Mar 6 11:09:26 2006 +0000
Canonicalization, first stage
All of
//item/@name | //field/@name | //list/@name | //fieldref/text() | //@value-mask-name | //@value-list-name
now formatted-like-this
diff --git a/xcb-proto/src/extensions/bigreq.xml b/xcb-proto/src/extensions/bigreq.xml
index bc3594e..070b9ca 100644
--- a/xcb-proto/src/extensions/bigreq.xml
+++ b/xcb-proto/src/extensions/bigreq.xml
@@ -29,7 +29,7 @@ authorization from the authors.
<request name="Enable" opcode="0">
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="maximum_request_length"/>
+ <field type="CARD32" name="maximum-request-length"/>
</reply>
</request>
</xcb>
diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index 53e7ef5..28992ef 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -28,14 +28,14 @@ authorization from the authors.
<xcb header="composite" extension-xname="Composite" extension-name="Composite">
<import>xfixes</import>
<enum name="Redirect">
- <item name="Automatic"/>
- <item name="Manual"/>
+ <item name="automatic"/>
+ <item name="manual"/>
</enum>
<request name="QueryVersion" opcode="0">
- <field type="VERSION" name="client_version"/>
+ <field type="VERSION" name="client-version"/>
<reply>
<pad bytes="1"/>
- <field type="VERSION" name="server_version"/>
+ <field type="VERSION" name="server-version"/>
<pad bytes="16"/>
</reply>
</request>
diff --git a/xcb-proto/src/extensions/damage.xml b/xcb-proto/src/extensions/damage.xml
index f3bc8a7..12b4655 100644
--- a/xcb-proto/src/extensions/damage.xml
+++ b/xcb-proto/src/extensions/damage.xml
@@ -29,19 +29,19 @@ authorization from the authors.
<import>xfixes</import>
<xidtype name="DAMAGE"/>
<enum name="ReportLevel">
- <item name="RawRectangles"/>
- <item name="DeltaRectangles"/>
- <item name="BoundingBox"/>
- <item name="NonEmpty"/>
+ <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"/>
+ <field type="CARD32" name="client-major-version"/>
+ <field type="CARD32" name="client-minor-version"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="major_version"/>
- <field type="CARD32" name="minor_version"/>
+ <field type="CARD32" name="major-version"/>
+ <field type="CARD32" name="minor-version"/>
<pad bytes="16"/>
</reply>
</request>
diff --git a/xcb-proto/src/extensions/dpms.xml b/xcb-proto/src/extensions/dpms.xml
index f61de27..97d13ed 100644
--- a/xcb-proto/src/extensions/dpms.xml
+++ b/xcb-proto/src/extensions/dpms.xml
@@ -27,10 +27,10 @@ authorization from the authors.
-->
<xcb header="dpms" extension-xname="DPMS" extension-name="DPMS">
<request name="GetVersion" opcode="0">
- <field type="VERSION" name="client_version"/>
+ <field type="VERSION" name="client-version"/>
<reply>
<pad bytes="1"/>
- <field type="VERSION" name="server_version"/>
+ <field type="VERSION" name="server-version"/>
</reply>
</request>
<request name="Capable" opcode="1">
@@ -42,25 +42,25 @@ authorization from the authors.
<request name="GetTimeouts" opcode="2">
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="standby_timeout"/>
- <field type="CARD16" name="suspend_timeout"/>
- <field type="CARD16" name="off_timeout"/>
+ <field type="CARD16" name="standby-timeout"/>
+ <field type="CARD16" name="suspend-timeout"/>
+ <field type="CARD16" name="off-timeout"/>
</reply>
</request>
<request name="SetTimeouts" opcode="3">
- <field type="CARD16" name="standby_timeout"/>
- <field type="CARD16" name="suspend_timeout"/>
- <field type="CARD16" name="off_timeout"/>
+ <field type="CARD16" name="standby-timeout"/>
+ <field type="CARD16" name="suspend-timeout"/>
+ <field type="CARD16" name="off-timeout"/>
</request>
<request name="Enable" opcode="4"/>
<request name="Disable" opcode="5"/>
<request name="ForceLevel" opcode="6">
- <field type="CARD16" name="power_level"/>
+ <field type="CARD16" name="power-level"/>
</request>
<request name="Info" opcode="7">
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="power_level"/>
+ <field type="CARD16" name="power-level"/>
<field type="BOOL" name="state"/>
</reply>
</request>
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index 8448a1f..ac22a30 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -28,38 +28,38 @@ authorization from the authors.
<xcb header="randr" extension-xname="RANDR" extension-name="RandR">
<!-- Implements version 1.1 of RANDR -->
<enum name="Rotation">
- <item name="Rotate_0">
+ <item name="rotate0">
<value>1</value>
</item>
- <item name="Rotate_90">
+ <item name="rotate90">
<value>2</value>
</item>
- <item name="Rotate_180">
+ <item name="rotate180">
<value>4</value>
</item>
- <item name="Rotate_270">
+ <item name="rotate270">
<value>8</value>
</item>
- <item name="Reflect_X">
+ <item name="reflect-x">
<value>16</value>
</item>
- <item name="Reflect_Y">
+ <item name="reflect-y">
<value>32</value>
</item>
</enum>
<struct name="RefreshRates">
- <field type="CARD16" name="nRates"/>
+ <field type="CARD16" name="n-rates"/>
<list type="CARD16" name="rates">
- <fieldref>nRates</fieldref>
+ <fieldref>n-rates</fieldref>
</list>
</struct>
<request name="QueryVersion" opcode="0">
- <field type="CARD32" name="major_version"/>
- <field type="CARD32" name="minor_version"/>
+ <field type="CARD32" name="major-version"/>
+ <field type="CARD32" name="minor-version"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="major_version"/>
- <field type="CARD32" name="minor_version"/>
+ <field type="CARD32" name="major-version"/>
+ <field type="CARD32" name="minor-version"/>
<pad bytes="16"/>
</reply>
</request>
@@ -70,31 +70,31 @@ authorization from the authors.
<request name="SetScreenConfig" opcode="2">
<field type="WINDOW" name="drawable"/>
<field type="TIMESTAMP" name="time"/>
- <field type="TIMESTAMP" name="config_time"/>
- <field type="CARD16" name="sizeID"/>
+ <field type="TIMESTAMP" name="config-time"/>
+ <field type="CARD16" name="size-id"/>
<field type="INT16" name="rotation"/>
<field type="CARD16" name="refresh"/>
<pad bytes="2"/>
<reply>
<field type="CARD8" name="status"/>
<field type="TIMESTAMP" name="time"/>
- <field type="TIMESTAMP" name="config_time"/>
+ <field type="TIMESTAMP" name="config-time"/>
<field type="WINDOW" name="root"/>
- <field type="CARD16" name="subpixel_order"/>
+ <field type="CARD16" name="subpixel-order"/>
<pad bytes="10"/>
</reply>
</request>
<enum name="SetConfig">
- <item name="Success">
+ <item name="success">
<value>0</value>
</item>
- <item name="InvalidConfigTime">
+ <item name="invalid-config-time">
<value>1</value>
</item>
- <item name="InvalidTime">
+ <item name="invalid-time">
<value>2</value>
</item>
- <item name="Failed">
+ <item name="failed">
<value>3</value>
</item>
</enum>
@@ -112,37 +112,37 @@ authorization from the authors.
<field type="CARD8" name="rotations"/>
<field type="WINDOW" name="root"/>
<field type="TIMESTAMP" name="time"/>
- <field type="TIMESTAMP" name="config_time"/>
- <field type="CARD16" name="nSizes"/>
- <field type="CARD16" name="sizeID"/>
+ <field type="TIMESTAMP" name="config-time"/>
+ <field type="CARD16" name="n-sizes"/>
+ <field type="CARD16" name="size-id"/>
<field type="INT16" name="rotation"/>
<field type="CARD16" name="rate"/>
- <field type="CARD16" name="nInfo"/>
+ <field type="CARD16" name="n-info"/>
<pad bytes="2"/>
<list type="ScreenSize" name="sizes">
- <fieldref>nSizes</fieldref>
+ <fieldref>n-sizes</fieldref>
</list>
<list type="RefreshRates" name="rates">
<op op="-">
- <fieldref>nInfo</fieldref>
- <fieldref>nSizes</fieldref>
+ <fieldref>n-info</fieldref>
+ <fieldref>n-sizes</fieldref>
</op>
</list>
</reply>
</request>
<enum name="SM">
- <item name="ScreenChangeNotify">
+ <item name="screen-change-notify">
<value>1</value>
</item>
</enum>
<event name="ScreenChangeNotify" number="0">
<field type="CARD8" name="rotation"/>
<field type="TIMESTAMP" name="time"/>
- <field type="TIMESTAMP" name="config_time"/>
+ <field type="TIMESTAMP" name="config-time"/>
<field type="WINDOW" name="root"/>
- <field type="WINDOW" name="request_window"/>
- <field type="CARD16" name="sizeID"/>
- <field type="CARD16" name="subpixel_order"/>
+ <field type="WINDOW" name="request-window"/>
+ <field type="CARD16" name="size-id"/>
+ <field type="CARD16" name="subpixel-order"/>
<field type="ScreenSize"/>
</event>
</xcb>
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index b64192a..2483f0c 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -41,104 +41,104 @@ authorization from the authors.
<field type="Range16" name="minor"/>
</struct>
<struct name="Range">
- <field type="Range8" name="core_requests"/>
- <field type="Range8" name="core_replies"/>
- <field type="ExtRange" name="ext_requests"/>
- <field type="ExtRange" name="ext_replies"/>
- <field type="Range8" name="delivered_events"/>
- <field type="Range8" name="device_events"/>
+ <field type="Range8" name="core-requests"/>
+ <field type="Range8" name="core-replies"/>
+ <field type="ExtRange" name="ext-requests"/>
+ <field type="ExtRange" name="ext-replies"/>
+ <field type="Range8" name="delivered-events"/>
+ <field type="Range8" name="device-events"/>
<field type="Range8" name="errors"/>
- <field type="BOOL" name="client_started"/>
- <field type="BOOL" name="client_died"/>
+ <field type="BOOL" name="client-started"/>
+ <field type="BOOL" name="client-died"/>
</struct>
<typedef oldname="CARD8" newname="ElementHeader"/>
<enum name="HType">
- <item name="FromServerTime">
+ <item name="from-server-time">
<value>0x01</value>
</item>
- <item name="FromClientTime">
+ <item name="from-client-time">
<value>0x02</value>
</item>
- <item name="FromClientSequence">
+ <item name="from-client-sequence">
<value>0x04</value>
</item>
</enum>
<typedef oldname="CARD32" newname="ClientSpec"/>
<enum name="CS">
- <item name="CurrentClients">
+ <item name="current-clients">
<value>1</value>
</item>
- <item name="FutureClients">
+ <item name="future-clients">
<value>2</value>
</item>
- <item name="AllClients">
+ <item name="all-clients">
<value>3</value>
</item>
</enum>
<struct name="ClientInfo">
- <field type="ClientSpec" name="client_resource"/>
- <field type="CARD32" name="num_ranges"/>
+ <field type="ClientSpec" name="client-resource"/>
+ <field type="CARD32" name="num-ranges"/>
<list type="Range" name="ranges">
- <fieldref>num_ranges</fieldref>
+ <fieldref>num-ranges</fieldref>
</list>
</struct>
<!-- Errors -->
<error name="BadContext" number="0">
- <field type="CARD32" name="invalid_record"/>
+ <field type="CARD32" name="invalid-record"/>
</error>
<!-- Requests -->
<request name="QueryVersion" opcode="0">
- <field type="CARD16" name="major_version"/>
- <field type="CARD16" name="minor_version"/>
+ <field type="CARD16" name="major-version"/>
+ <field type="CARD16" name="minor-version"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="major_version"/>
- <field type="CARD16" name="minor_version"/>
+ <field type="CARD16" name="major-version"/>
+ <field type="CARD16" name="minor-version"/>
</reply>
</request>
<request name="CreateContext" opcode="1">
<field type="record:CONTEXT" name="context"/>
- <field type="ElementHeader" name="element_header"/>
+ <field type="ElementHeader" name="element-header"/>
<pad bytes="3"/>
- <field type="CARD32" name="num_client_specs"/>
- <field type="CARD32" name="num_ranges"/>
- <list type="ClientSpec" name="client_specs">
- <fieldref>num_client_specs</fieldref>
+ <field type="CARD32" name="num-client-specs"/>
+ <field type="CARD32" name="num-ranges"/>
+ <list type="ClientSpec" name="client-specs">
+ <fieldref>num-client-specs</fieldref>
</list>
<list type="Range" name="ranges">
- <fieldref>num_ranges</fieldref>
+ <fieldref>num-ranges</fieldref>
</list>
</request>
<request name="RegisterClients" opcode="2">
<field type="record:CONTEXT" name="context"/>
- <field type="ElementHeader" name="element_header"/>
+ <field type="ElementHeader" name="element-header"/>
<pad bytes="3"/>
- <field type="CARD32" name="num_client_specs"/>
- <field type="CARD32" name="num_ranges"/>
- <list type="ClientSpec" name="client_specs">
- <fieldref>num_client_specs</fieldref>
+ <field type="CARD32" name="num-client-specs"/>
+ <field type="CARD32" name="num-ranges"/>
+ <list type="ClientSpec" name="client-specs">
+ <fieldref>num-client-specs</fieldref>
</list>
<list type="Range" name="ranges">
- <fieldref>num_ranges</fieldref>
+ <fieldref>num-ranges</fieldref>
</list>
</request>
<request name="UnregisterClients" opcode="3">
<field type="record:CONTEXT" name="context"/>
- <field type="CARD32" name="num_client_specs"/>
- <list type="ClientSpec" name="client_specs">
- <fieldref>num_client_specs</fieldref>
+ <field type="CARD32" name="num-client-specs"/>
+ <list type="ClientSpec" name="client-specs">
+ <fieldref>num-client-specs</fieldref>
</list>
</request>
<request name="GetContext" opcode="4">
<field type="record:CONTEXT" name="context"/>
<reply>
<field type="BOOL" name="enabled"/>
- <field type="ElementHeader" name="element_header"/>
+ <field type="ElementHeader" name="element-header"/>
<pad bytes="3"/>
- <field type="CARD32" name="num_intercepted_clients"/>
+ <field type="CARD32" name="num-intercepted-clients"/>
<pad bytes="16"/>
- <list type="ClientInfo" name="intercepted_clients">
- <fieldref>num_intercepted_clients</fieldref>
+ <list type="ClientInfo" name="intercepted-clients">
+ <fieldref>num-intercepted-clients</fieldref>
</list>
</reply>
</request>
@@ -146,12 +146,12 @@ authorization from the authors.
<field type="record:CONTEXT" name="context"/>
<reply>
<field type="CARD8" name="category"/>
- <field type="ElementHeader" name="element_header"/>
- <field type="BOOL" name="client_swapped"/>
+ <field type="ElementHeader" name="element-header"/>
+ <field type="BOOL" name="client-swapped"/>
<pad bytes="2"/>
- <field type="CARD32" name="xid_base"/>
- <field type="CARD32" name="server_time"/>
- <field type="CARD32" name="rec_sequence_num"/>
+ <field type="CARD32" name="xid-base"/>
+ <field type="CARD32" name="server-time"/>
+ <field type="CARD32" name="rec-sequence-num"/>
<pad bytes="8"/>
<list type="BYTE" name="data"/>
</reply>
diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index 18e7499..fae39d5 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -7,136 +7,136 @@ for licensing information.
<xcb header="render" extension-xname="RENDER" extension-name="Render">
<!-- supports version 0.8 -->
<enum name="PictType">
- <item name="Indexed"/>
- <item name="Direct"/>
+ <item name="indexed"/>
+ <item name="direct"/>
</enum>
<!-- Disjoint* and Conjoint* are new in version 0.2 -->
<enum name="PictOp">
- <item name="Clear"/>
- <item name="Src"/>
- <item name="Dst"/>
- <item name="Over"/>
- <item name="OverReverse"/>
- <item name="In"/>
- <item name="InReverse"/>
- <item name="Out"/>
- <item name="OutReverse"/>
- <item name="Atop"/>
- <item name="AtopReverse"/>
- <item name="Xor"/>
- <item name="Add"/>
- <item name="Saturate"/>
- <item name="DisjointClear">
+ <item name="clear"/>
+ <item name="src"/>
+ <item name="dst"/>
+ <item name="over"/>
+ <item name="over-reverse"/>
+ <item name="in"/>
+ <item name="in-reverse"/>
+ <item name="out"/>
+ <item name="out-reverse"/>
+ <item name="atop"/>
+ <item name="atop-reverse"/>
+ <item name="xor"/>
+ <item name="add"/>
+ <item name="saturate"/>
+ <item name="disjoint-clear">
<value>0x10</value>
</item>
- <item name="DisjointSrc"/>
- <item name="DisjointDst"/>
- <item name="DisjointOver"/>
- <item name="DisjointOverReverse"/>
- <item name="DisjointIn"/>
- <item name="DisjointInReverse"/>
- <item name="DisjointOut"/>
- <item name="DisjointOutReverse"/>
- <item name="DisjointAtop"/>
- <item name="DisjointAtopReverse"/>
- <item name="DisjointXor"/>
- <item name="ConjointClear">
+ <item name="disjoint-src"/>
+ <item name="disjoint-dst"/>
+ <item name="disjoint-over"/>
+ <item name="disjoint-over-reverse"/>
+ <item name="disjoint-in"/>
+ <item name="disjoint-in-reverse"/>
+ <item name="disjoint-out"/>
+ <item name="disjoint-out-reverse"/>
+ <item name="disjoint-atop"/>
+ <item name="disjoint-atop-reverse"/>
+ <item name="disjoint-xor"/>
+ <item name="conjoint-clear">
<value>0x20</value>
</item>
- <item name="ConjointSrc"/>
- <item name="ConjointDst"/>
- <item name="ConjointOver"/>
- <item name="ConjointOverReverse"/>
- <item name="ConjointIn"/>
- <item name="ConjointInReverse"/>
- <item name="ConjointOut"/>
- <item name="ConjointOutReverse"/>
- <item name="ConjointAtop"/>
- <item name="ConjointAtopReverse"/>
- <item name="ConjointXor"/>
+ <item name="conjoint-src"/>
+ <item name="conjoint-dst"/>
+ <item name="conjoint-over"/>
+ <item name="conjoint-over-reverse"/>
+ <item name="conjoint-in"/>
+ <item name="conjoint-in-reverse"/>
+ <item name="conjoint-out"/>
+ <item name="conjoint-out-reverse"/>
+ <item name="conjoint-atop"/>
+ <item name="conjoint-atop-reverse"/>
+ <item name="conjoint-xor"/>
</enum>
<enum name="PolyEdge">
- <item name="Sharp"/>
- <item name="Smooth"/>
+ <item name="sharp"/>
+ <item name="smooth"/>
</enum>
<enum name="PolyMode">
- <item name="Precise"/>
- <item name="Imprecise"/>
+ <item name="precise"/>
+ <item name="imprecise"/>
</enum>
<enum name="CP">
- <item name="Repeat">
+ <item name="repeat">
<op op="<<">
<value>1</value>
<value>0</value>
</op>
</item>
- <item name="AlphaMap">
+ <item name="alpha-map">
<op op="<<">
<value>1</value>
<value>1</value>
</op>
</item>
- <item name="AlphaXOrigin">
+ <item name="alpha-x-origin">
<op op="<<">
<value>1</value>
<value>2</value>
</op>
</item>
- <item name="AlphaYOrigin">
+ <item name="alpha-y-origin">
<op op="<<">
<value>1</value>
<value>3</value>
</op>
</item>
- <item name="ClipXOrigin">
+ <item name="clip-x-origin">
<op op="<<">
<value>1</value>
<value>4</value>
</op>
</item>
- <item name="ClipYOrigin">
+ <item name="clip-y-origin">
<op op="<<">
<value>1</value>
<value>5</value>
</op>
</item>
- <item name="ClipMask">
+ <item name="clip-mask">
<op op="<<">
<value>1</value>
<value>6</value>
</op>
</item>
- <item name="GraphicsExposure">
+ <item name="graphics-exposure">
<op op="<<">
<value>1</value>
<value>7</value>
</op>
</item>
- <item name="SubwindowMode">
+ <item name="subwindow-mode">
<op op="<<">
<value>1</value>
<value>8</value>
</op>
</item>
- <item name="PolyEdge">
+ <item name="poly-edge">
<op op="<<">
<value>1</value>
<value>9</value>
</op>
</item>
- <item name="PolyMode">
+ <item name="poly-mode">
<op op="<<">
<value>1</value>
<value>10</value>
</op>
</item>
- <item name="Dither">
+ <item name="dither">
<op op="<<">
<value>1</value>
<value>11</value>
</op>
</item>
- <item name="ComponentAlpha">
+ <item name="component-alpha">
<op op="<<">
<value>1</value>
<value>12</value>
@@ -144,12 +144,12 @@ for licensing information.
</item>
</enum>
<enum name="SubPixel">
- <item name="Unknown"/>
- <item name="HorizontalRGB"/>
- <item name="HorizontalBGR"/>
- <item name="VerticalRGB"/>
- <item name="VerticalBGR"/>
- <item name="None"/>
+ <item name="unknown"/>
+ <item name="horizontal-rgb"/>
+ <item name="horizontal-bgr"/>
+ <item name="vertical-rgb"/>
+ <item name="vertical-bgr"/>
+ <item name="none"/>
</enum>
<typedef oldname="CARD32" newname="GLYPH"/>
<xidtype name="GLYPHSET"/>
@@ -162,14 +162,14 @@ for licensing information.
<error name="GlyphSet" number="3"/>
<error name="Glyph" number="4"/>
<struct name="DIRECTFORMAT">
- <field type="CARD16" name="red_shift"/>
- <field type="CARD16" name="red_mask"/>
- <field type="CARD16" name="green_shift"/>
- <field type="CARD16" name="green_mask"/>
- <field type="CARD16" name="blue_shift"/>
- <field type="CARD16" name="blue_mask"/>
- <field type="CARD16" name="alpha_shift"/>
- <field type="CARD16" name="alpha_mask"/>
+ <field type="CARD16" name="red-shift"/>
+ <field type="CARD16" name="red-mask"/>
+ <field type="CARD16" name="green-shift"/>
+ <field type="CARD16" name="green-mask"/>
+ <field type="CARD16" name="blue-shift"/>
+ <field type="CARD16" name="blue-mask"/>
+ <field type="CARD16" name="alpha-shift"/>
+ <field type="CARD16" name="alpha-mask"/>
</struct>
<struct name="PICTFORMINFO">
<field type="PICTFORMAT" name="id"/>
@@ -186,17 +186,17 @@ for licensing information.
<struct name="PICTDEPTH">
<field type="CARD8" name="depth"/>
<pad bytes="1"/>
- <field type="CARD16" name="num_visuals"/>
+ <field type="CARD16" name="num-visuals"/>
<pad bytes="4"/>
<list type="PICTVISUAL" name="visuals">
- <fieldref>num_visuals</fieldref>
+ <fieldref>num-visuals</fieldref>
</list>
</struct>
<struct name="PICTSCREEN">
- <field type="CARD32" name="num_depths"/>
+ <field type="CARD32" name="num-depths"/>
<field type="PICTFORMAT" name="fallback"/>
<list type="PICTDEPTH" name="depths">
- <fieldref>num_depths</fieldref>
+ <fieldref>num-depths</fieldref>
</list>
</struct>
<struct name="INDEXVALUE">
@@ -236,37 +236,37 @@ for licensing information.
<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="INT16" name="x-off"/>
+ <field type="INT16" name="y-off"/>
</struct>
<request name="QueryVersion" opcode="0">
- <field type="CARD32" name="client_major_version"/>
- <field type="CARD32" name="client_minor_version"/>
+ <field type="CARD32" name="client-major-version"/>
+ <field type="CARD32" name="client-minor-version"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="major_version"/>
- <field type="CARD32" name="minor_version"/>
+ <field type="CARD32" name="major-version"/>
+ <field type="CARD32" name="minor-version"/>
<pad bytes="16"/>
</reply>
</request>
<request name="QueryPictFormats" opcode="1">
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="num_formats"/>
- <field type="CARD32" name="num_screens"/>
- <field type="CARD32" name="num_depths"/>
- <field type="CARD32" name="num_visuals"/>
- <field type="CARD32" name="num_subpixel"/>
+ <field type="CARD32" name="num-formats"/>
+ <field type="CARD32" name="num-screens"/>
+ <field type="CARD32" name="num-depths"/>
+ <field type="CARD32" name="num-visuals"/>
+ <field type="CARD32" name="num-subpixel"/>
<!-- new in version 0.6 -->
<pad bytes="4"/>
<list type="PICTFORMINFO" name="formats">
- <fieldref>num_formats</fieldref>
+ <fieldref>num-formats</fieldref>
</list>
<list type="PICTSCREEN" name="screens">
- <fieldref>num_screens</fieldref>
+ <fieldref>num-screens</fieldref>
</list>
<list type="CARD32" name="subpixels">
- <fieldref>num_subpixel</fieldref>
+ <fieldref>num-subpixel</fieldref>
</list>
</reply>
</request>
@@ -275,10 +275,10 @@ for licensing information.
<field type="PICTFORMAT" name="format"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="num_values"/>
+ <field type="CARD32" name="num-values"/>
<pad bytes="20"/>
<list type="INDEXVALUE" name="values">
- <fieldref>num_values</fieldref>
+ <fieldref>num-values</fieldref>
</list>
</reply>
</request>
@@ -287,16 +287,16 @@ for licensing information.
<field type="PICTURE" name="pid"/>
<field type="DRAWABLE" name="drawable"/>
<field type="PICTFORMAT" name="format"/>
- <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="ChangePicture" opcode="5">
<field type="PICTURE" name="picture"/>
- <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="SetPictureClipRectangles" opcode="6">
<field type="PICTURE" name="picture"/>
- <field type="INT16" name="clip_x_origin"/>
- <field type="INT16" name="clip_y_origin"/>
+ <field type="INT16" name="clip-x-origin"/>
+ <field type="INT16" name="clip-y-origin"/>
<list type="RECTANGLE" name="rectangles"/>
</request>
<request name="FreePicture" opcode="7">
@@ -308,12 +308,12 @@ for licensing information.
<field type="PICTURE" name="src"/>
<field type="PICTURE" name="mask"/>
<field type="PICTURE" name="dst"/>
- <field type="INT16" name="src_x"/>
- <field type="INT16" name="src_y"/>
- <field type="INT16" name="mask_x"/>
- <field type="INT16" name="mask_y"/>
- <field type="INT16" name="dst_x"/>
- <field type="INT16" name="dst_y"/>
+ <field type="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
+ <field type="INT16" name="mask-x"/>
+ <field type="INT16" name="mask-y"/>
+ <field type="INT16" name="dst-x"/>
+ <field type="INT16" name="dst-y"/>
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
</request>
@@ -323,9 +323,9 @@ for licensing information.
<pad bytes="3"/>
<field type="PICTURE" name="src"/>
<field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask_format"/>
- <field type="INT16" name="src_x"/>
- <field type="INT16" name="src_y"/>
+ <field type="PICTFORMAT" name="mask-format"/>
+ <field type="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
<list type="TRAP" name="traps"/>
</request>
<request name="Triangles" opcode="11">
@@ -333,9 +333,9 @@ for licensing information.
<pad bytes="3"/>
<field type="PICTURE" name="src"/>
<field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask_format"/>
- <field type="INT16" name="src_x"/>
- <field type="INT16" name="src_y"/>
+ <field type="PICTFORMAT" name="mask-format"/>
+ <field type="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
<list type="TRIANGLE" name="triangles"/>
</request>
<request name="TriStrip" opcode="12">
@@ -343,9 +343,9 @@ for licensing information.
<pad bytes="3"/>
<field type="PICTURE" name="src"/>
<field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask_format"/>
- <field type="INT16" name="src_x"/>
- <field type="INT16" name="src_y"/>
+ <field type="PICTFORMAT" name="mask-format"/>
+ <field type="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
<list type="POINTFIX" name="points"/>
</request>
<request name="TriFan" opcode="13">
@@ -353,9 +353,9 @@ for licensing information.
<pad bytes="3"/>
<field type="PICTURE" name="src"/>
<field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask_format"/>
- <field type="INT16" name="src_x"/>
- <field type="INT16" name="src_y"/>
+ <field type="PICTFORMAT" name="mask-format"/>
+ <field type="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
<list type="POINTFIX" name="points"/>
</request>
<!-- opcode 14 reserved for ColorTrapezoids -->
@@ -374,12 +374,12 @@ for licensing information.
</request>
<request name="AddGlyphs" opcode="20">
<field type="GLYPHSET" name="glyphset"/>
- <field type="CARD32" name="glyphs_len"/>
+ <field type="CARD32" name="glyphs-len"/>
<list type="CARD32" name="glyphids">
- <fieldref>glyphs_len</fieldref>
+ <fieldref>glyphs-len</fieldref>
</list>
<list type="GLYPHINFO" name="glyphs">
- <fieldref>glyphs_len</fieldref>
+ <fieldref>glyphs-len</fieldref>
</list>
<list type="BYTE" name="data"/>
</request>
@@ -414,10 +414,10 @@ for licensing information.
<pad bytes="3"/>
<field type="PICTURE" name="src"/>
<field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask_format"/>
+ <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="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
<list type="GLYPHITEM8" name="glyphcmds"/>
</request>
<!-- CompositeGlyphs16 -->
@@ -439,10 +439,10 @@ for licensing information.
<pad bytes="3"/>
<field type="PICTURE" name="src"/>
<field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask_format"/>
+ <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="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
<list type="GLYPHITEM16" name="glyphcmds"/>
</request>
<!-- CompositeGlyphs32 -->
@@ -464,10 +464,10 @@ for licensing information.
<pad bytes="3"/>
<field type="PICTURE" name="src"/>
<field type="PICTURE" name="dst"/>
- <field type="PICTFORMAT" name="mask_format"/>
+ <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="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
<list type="GLYPHITEM32" name="glyphcmds"/>
</request>
<!-- new in version 0.1 -->
@@ -505,22 +505,22 @@ for licensing information.
<field type="DRAWABLE" name="drawable"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="num_aliases"/>
- <field type="CARD32" name="num_filters"/>
+ <field type="CARD32" name="num-aliases"/>
+ <field type="CARD32" name="num-filters"/>
<pad bytes="16"/>
<list type="CARD16" name="aliases">
- <fieldref>num_aliases</fieldref>
+ <fieldref>num-aliases</fieldref>
</list>
<list type="STR" name="filters">
- <fieldref>num_filters</fieldref>
+ <fieldref>num-filters</fieldref>
</list>
</reply>
</request>
<request name="SetPictureFilter" opcode="30">
<field type="PICTURE" name="picture"/>
- <field type="CARD16" name="filter_len"/>
+ <field type="CARD16" name="filter-len"/>
<list type="char" name="filter">
- <fieldref>filter_len</fieldref>
+ <fieldref>filter-len</fieldref>
</list>
<list type="FIXED" name="values"/>
</request>
diff --git a/xcb-proto/src/extensions/res.xml b/xcb-proto/src/extensions/res.xml
index fe09b98..0f118fa 100644
--- a/xcb-proto/src/extensions/res.xml
+++ b/xcb-proto/src/extensions/res.xml
@@ -27,29 +27,29 @@ authorization from the authors.
-->
<xcb header="res" extension-xname="X-Resource" extension-name="Res">
<struct name="Client">
- <field type="CARD32" name="resource_base"/>
- <field type="CARD32" name="resource_mask"/>
+ <field type="CARD32" name="resource-base"/>
+ <field type="CARD32" name="resource-mask"/>
</struct>
<struct name="Type">
- <field type="CARD32" name="resource_type"/>
+ <field type="CARD32" name="resource-type"/>
<field type="CARD32" name="count"/>
</struct>
<request name="QueryVersion" opcode="0">
- <field type="CARD8" name="client_major"/>
- <field type="CARD8" name="client_minor"/>
+ <field type="CARD8" name="client-major"/>
+ <field type="CARD8" name="client-minor"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="server_major"/>
- <field type="CARD16" name="server_minor"/>
+ <field type="CARD16" name="server-major"/>
+ <field type="CARD16" name="server-minor"/>
</reply>
</request>
<request name="QueryClients" opcode="1">
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="num_clients"/>
+ <field type="CARD32" name="num-clients"/>
<pad bytes="20"/>
<list type="Client" name="clients">
- <fieldref>num_clients</fieldref>
+ <fieldref>num-clients</fieldref>
</list>
</reply>
</request>
@@ -57,10 +57,10 @@ authorization from the authors.
<field type="CARD32" name="xid"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="num_types"/>
+ <field type="CARD32" name="num-types"/>
<pad bytes="20"/>
<list type="Type" name="types">
- <fieldref>num_types</fieldref>
+ <fieldref>num-types</fieldref>
</list>
</reply>
</request>
@@ -69,7 +69,7 @@ authorization from the authors.
<reply>
<pad bytes="1"/>
<field type="CARD32" name="bytes"/>
- <field type="CARD32" name="bytes_overflow"/>
+ <field type="CARD32" name="bytes-overflow"/>
</reply>
</request>
</xcb>
diff --git a/xcb-proto/src/extensions/screensaver.xml b/xcb-proto/src/extensions/screensaver.xml
index 6507f0a..2f2f6cb 100644
--- a/xcb-proto/src/extensions/screensaver.xml
+++ b/xcb-proto/src/extensions/screensaver.xml
@@ -33,18 +33,18 @@ Draft Standard Version 1.0
<xcb header="screensaver" extension-xname="SCREENSAVER" extension-name="ScreenSaver">
<!-- Types -->
<enum name="KIND">
- <item name="Blanked"/>
- <item name="Internal"/>
- <item name="External"/>
+ <item name="blanked"/>
+ <item name="internal"/>
+ <item name="external"/>
</enum>
<enum name="EVENT">
- <item name="NotifyMask">
+ <item name="notify-mask">
<op op="<<">
<value>1</value>
<value>0</value>
</op>
</item>
- <item name="CycleMask">
+ <item name="cycle-mask">
<op op="<<">
<value>1</value>
<value>1</value>
@@ -52,26 +52,26 @@ Draft Standard Version 1.0
</item>
</enum>
<enum name="STATE">
- <item name="Off"/>
- <item name="On"/>
- <item name="Cycle"/>
- <item name="Disabled"/>
+ <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"/>
+ <item name="copy-from-parent"/>
+ <item name="input-output"/>
+ <item name="input-only"/>
</enum>
<!-- Errors -->
<!-- Requests -->
<request name="QueryVersion" opcode="0">
- <field type="CARD8" name="client_major_version"/>
- <field type="CARD8" name="client_minor_version"/>
+ <field type="CARD8" name="client-major-version"/>
+ <field type="CARD8" name="client-minor-version"/>
<pad bytes="2"/>
<reply>
<pad bytes="1"/>
- <field type="CARD8" name="server_major_version"/>
- <field type="CARD8" name="server_minor_version"/>
+ <field type="CARD8" name="server-major-version"/>
+ <field type="CARD8" name="server-minor-version"/>
<pad bytes="22"/>
</reply>
</request>
@@ -79,26 +79,26 @@ Draft Standard Version 1.0
<field type="DRAWABLE" name="drawable"/>
<reply>
<field type="CARD8" name="state"/>
- <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="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"/>
</reply>
</request>
<request name="SelectInput" opcode="2">
<field type="DRAWABLE" name="drawable"/>
- <field type="EVENT" name="event_mask"/>
+ <field type="EVENT" name="event-mask"/>
</request>
<request name="SetAttributes" opcode="3">
<field type="DRAWABLE" name="drawable"/>
<field type="RECTANGLE"/>
- <field type="CARD16" name="border_width"/>
+ <field type="CARD16" name="border-width"/>
<field type="CLASS" name="class"/>
<field type="CARD8" name="depth"/>
<field type="VISUALID" name="visual"/>
- <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="UnsetAttributes" opcode="4">
<field type="DRAWABLE" name="drawable"/>
@@ -107,7 +107,7 @@ Draft Standard Version 1.0
<event name="Notify" number="0">
<field type="CARD8" name="code"/>
<field type="STATE" name="state"/>
- <field type="CARD16" name="sequence_number"/>
+ <field type="CARD16" name="sequence-number"/>
<field type="TIMESTAMP" name="time"/>
<field type="WINDOW" name="root"/>
<field type="WINDOW" name="window"/>
diff --git a/xcb-proto/src/extensions/shape.xml b/xcb-proto/src/extensions/shape.xml
index 72a6be9..c5e313e 100644
--- a/xcb-proto/src/extensions/shape.xml
+++ b/xcb-proto/src/extensions/shape.xml
@@ -30,102 +30,102 @@ authorization from the authors.
<typedef oldname="CARD8" newname="SHAPE_KIND"/>
<!-- Shape attributes of type SHAPE_OP. -->
<enum name="SO">
- <item name="Set"/>
- <item name="Union"/>
- <item name="Intersect"/>
- <item name="Subtract"/>
- <item name="Invert"/>
+ <item name="set"/>
+ <item name="union"/>
+ <item name="intersect"/>
+ <item name="subtract"/>
+ <item name="invert"/>
</enum>
<!-- Shape attributes of type SHAPE_KIND. -->
<enum name="SK">
- <item name="Bounding"/>
- <item name="Clip"/>
+ <item name="bounding"/>
+ <item name="clip"/>
<!-- TODO: xspec: 'Input' borrowed from xlib headers, validate -->
- <item name="Input"/>
+ <item name="input"/>
</enum>
<event name="Notify" number="0">
- <field type="SHAPE_KIND" name="shape_kind"/>
- <field type="WINDOW" name="affected_window"/>
- <field type="INT16" name="extents_x"/>
- <field type="INT16" name="extents_y"/>
- <field type="CARD16" name="extents_width"/>
- <field type="CARD16" name="extents_height"/>
- <field type="TIMESTAMP" name="server_time"/>
+ <field type="SHAPE_KIND" name="shape-kind"/>
+ <field type="WINDOW" name="affected-window"/>
+ <field type="INT16" name="extents-x"/>
+ <field type="INT16" name="extents-y"/>
+ <field type="CARD16" name="extents-width"/>
+ <field type="CARD16" name="extents-height"/>
+ <field type="TIMESTAMP" name="server-time"/>
<field type="BOOL" name="shaped"/>
</event>
<request name="QueryVersion" opcode="0">
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="major_version"/>
- <field type="CARD16" name="minor_version"/>
+ <field type="CARD16" name="major-version"/>
+ <field type="CARD16" name="minor-version"/>
</reply>
</request>
<request name="Rectangles" opcode="1">
<field type="SHAPE_OP" name="operation"/>
- <field type="SHAPE_KIND" name="destination_kind"/>
+ <field type="SHAPE_KIND" name="destination-kind"/>
<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="WINDOW" name="destination-window"/>
+ <field type="INT16" name="x-offset"/>
+ <field type="INT16" name="y-offset"/>
<list type="RECTANGLE" name="rectangles"/>
</request>
<request name="Mask" opcode="2">
<field type="SHAPE_OP" name="operation"/>
- <field type="SHAPE_KIND" name="destination_kind"/>
+ <field type="SHAPE_KIND" 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="PIXMAP" name="source_bitmap"/>
+ <field type="WINDOW" name="destination-window"/>
+ <field type="INT16" name="x-offset"/>
+ <field type="INT16" name="y-offset"/>
+ <field type="PIXMAP" name="source-bitmap"/>
</request>
<request name="Combine" opcode="3">
<field type="SHAPE_OP" name="operation"/>
- <field type="SHAPE_KIND" name="destination_kind"/>
- <field type="SHAPE_KIND" name="source_kind"/>
+ <field type="SHAPE_KIND" name="destination-kind"/>
+ <field type="SHAPE_KIND" 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="WINDOW" name="source_window"/>
+ <field type="WINDOW" name="destination-window"/>
+ <field type="INT16" name="x-offset"/>
+ <field type="INT16" name="y-offset"/>
+ <field type="WINDOW" name="source-window"/>
</request>
<request name="Offset" opcode="4">
- <field type="SHAPE_KIND" name="destination_kind"/>
+ <field type="SHAPE_KIND" 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="WINDOW" name="destination-window"/>
+ <field type="INT16" name="x-offset"/>
+ <field type="INT16" name="y-offset"/>
</request>
<request name="QueryExtents" opcode="5">
- <field type="WINDOW" name="destination_window"/>
+ <field type="WINDOW" name="destination-window"/>
<reply>
<pad bytes="1"/>
- <field type="BOOL" name="bounding_shaped"/>
- <field type="BOOL" name="clip_shaped"/>
+ <field type="BOOL" name="bounding-shaped"/>
+ <field type="BOOL" name="clip-shaped"/>
<pad bytes="2"/>
<!-- FIXME: xspec: validate unrolling -->
- <field type="RECTANGLE" name="bounding_shape_extents"/>
- <field type="RECTANGLE" name="clip_shape_extents"/>
+ <field type="RECTANGLE" name="bounding-shape-extents"/>
+ <field type="RECTANGLE" name="clip-shape-extents"/>
</reply>
</request>
<request name="SelectInput" opcode="6">
- <field type="WINDOW" name="destination_window"/>
+ <field type="WINDOW" name="destination-window"/>
<field type="BOOL" name="enable"/>
</request>
<request name="InputSelected" opcode="7">
- <field type="WINDOW" name="destination_window"/>
+ <field type="WINDOW" name="destination-window"/>
<reply>
<field type="BOOL" name="enabled"/>
</reply>
</request>
<request name="GetRectangles" opcode="8">
<field type="WINDOW" name="window"/>
- <field type="SHAPE_KIND" name="source_kind"/>
+ <field type="SHAPE_KIND" name="source-kind"/>
<reply>
<field type="BYTE" name="ordering"/>
- <field type="CARD32" name="rectangles_len"/>
+ <field type="CARD32" name="rectangles-len"/>
<list type="RECTANGLE" name="rectangles">
- <fieldref>rectangles_len</fieldref>
+ <fieldref>rectangles-len</fieldref>
</list>
</reply>
</request>
diff --git a/xcb-proto/src/extensions/shm.xml b/xcb-proto/src/extensions/shm.xml
index 62a74c1..8411e97 100644
--- a/xcb-proto/src/extensions/shm.xml
+++ b/xcb-proto/src/extensions/shm.xml
@@ -31,25 +31,25 @@ authorization from the authors.
<pad bytes="1"/>
<field type="DRAWABLE" name="drawable"/>
<field type="SEG" name="shmseg"/>
- <field type="CARD16" name="minor_event"/>
- <field type="BYTE" name="major_event"/>
+ <field type="CARD16" name="minor-event"/>
+ <field type="BYTE" name="major-event"/>
<pad bytes="1"/>
<field type="CARD32" name="offset"/>
</event>
<errorcopy name="BadSeg" number="0" ref="Value"/>
<request name="QueryVersion" opcode="0">
<reply>
- <field type="BOOL" name="shared_pixmaps"/>
+ <field type="BOOL" name="shared-pixmaps"/>
<field type="VERSION"/>
<field type="CARD16" name="uid"/>
<field type="CARD16" name="gid"/>
- <field type="CARD8" name="pixmap_format"/>
+ <field type="CARD8" name="pixmap-format"/>
</reply>
</request>
<request name="Attach" opcode="1">
<field type="SEG" name="shmseg"/>
<field type="CARD32" name="shmid"/>
- <field type="BOOL" name="read_only"/>
+ <field type="BOOL" name="read-only"/>
</request>
<request name="Detach" opcode="2">
<field type="SEG" name="shmseg"/>
@@ -57,16 +57,16 @@ authorization from the authors.
<request name="PutImage" opcode="3">
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
- <field type="SIZE" name="total_size"/>
- <field type="CARD16" name="src_x"/>
- <field type="CARD16" name="src_y"/>
- <field type="CARD16" name="src_width"/>
- <field type="CARD16" name="src_height"/>
- <field type="INT16" name="dst_x"/>
- <field type="INT16" name="dst_y"/>
+ <field type="SIZE" name="total-size"/>
+ <field type="CARD16" name="src-x"/>
+ <field type="CARD16" name="src-y"/>
+ <field type="CARD16" name="src-width"/>
+ <field type="CARD16" name="src-height"/>
+ <field type="INT16" name="dst-x"/>
+ <field type="INT16" name="dst-y"/>
<field type="CARD8" name="depth"/>
<field type="CARD8" name="format"/>
- <field type="CARD8" name="send_event"/>
+ <field type="CARD8" name="send-event"/>
<pad bytes="1"/>
<field type="SEG" name="shmseg"/>
<field type="CARD32" name="offset"/>
@@ -74,7 +74,7 @@ authorization from the authors.
<request name="GetImage" opcode="4">
<field type="DRAWABLE" name="drawable"/>
<field type="RECTANGLE"/>
- <field type="CARD32" name="plane_mask"/>
+ <field type="CARD32" name="plane-mask"/>
<field type="CARD8" name="format"/>
<pad bytes="3"/>
<field type="SEG" name="shmseg"/>
diff --git a/xcb-proto/src/extensions/sync.xml b/xcb-proto/src/extensions/sync.xml
index 23f391f..1c8f2a3 100644
--- a/xcb-proto/src/extensions/sync.xml
+++ b/xcb-proto/src/extensions/sync.xml
@@ -7,20 +7,20 @@ for licensing information.
<xcb header="sync" extension-xname="SYNC" extension-name="Sync">
<xidtype name="ALARM"/>
<enum name="ALARMSTATE">
- <item name="Active"/>
- <item name="Inactive"/>
- <item name="Destroyed"/>
+ <item name="active"/>
+ <item name="inactive"/>
+ <item name="destroyed"/>
</enum>
<xidtype name="COUNTER"/>
<enum name="TESTTYPE">
- <item name="PositiveTransition"/>
- <item name="NegativeTransition"/>
- <item name="PositiveComparison"/>
- <item name="NegativeComparison"/>
+ <item name="positive-transition"/>
+ <item name="negative-transition"/>
+ <item name="positive-comparison"/>
+ <item name="negative-comparison"/>
</enum>
<enum name="VALUETYPE">
- <item name="Absolute"/>
- <item name="Relative"/>
+ <item name="absolute"/>
+ <item name="relative"/>
</enum>
<struct name="INT64">
<field type="INT32" name="hi"/>
@@ -29,51 +29,51 @@ for licensing information.
<struct name="SYSTEMCOUNTER">
<field type="COUNTER" name="counter"/>
<field type="INT64" name="resolution"/>
- <field type="CARD16" name="name_len"/>
+ <field type="CARD16" name="name-len"/>
<list type="CARD8" name="name">
- <fieldref>name_len</fieldref>
+ <fieldref>name-len</fieldref>
</list>
</struct>
<struct name="TRIGGER">
<field type="COUNTER" name="counter"/>
- <field type="VALUETYPE" name="wait_type"/>
- <field type="INT64" name="wait_value"/>
- <field type="TESTTYPE" name="test_type"/>
+ <field type="VALUETYPE" name="wait-type"/>
+ <field type="INT64" name="wait-value"/>
+ <field type="TESTTYPE" name="test-type"/>
</struct>
<struct name="WAITCONDITION">
<field type="TRIGGER" name="trigger"/>
- <field type="INT64" name="event_threshold"/>
+ <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"/>
+ <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"/>
+ <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"/>
- <field type="CARD8" name="major_version"/>
- <field type="CARD8" name="minor_version"/>
+ <field type="CARD8" name="major-version"/>
+ <field type="CARD8" name="minor-version"/>
</reply>
</request>
<request name="ListSystemCounters" opcode="1">
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="counters_len"/>
+ <field type="CARD32" name="counters-len"/>
<pad bytes="20"/>
<list type="SYSTEMCOUNTER" name="counters">
- <fieldref>counters_len</fieldref>
+ <fieldref>counters-len</fieldref>
</list>
</reply>
</request>
<request name="CreateCounter" opcode="2">
<field type="COUNTER" name="id"/>
- <field type="INT64" name="initial_value"/>
+ <field type="INT64" name="initial-value"/>
</request>
<request name="DestroyCounter" opcode="6">
<field type="COUNTER" name="counter"/>
@@ -82,11 +82,11 @@ for licensing information.
<field type="COUNTER" name="counter"/>
<reply>
<pad bytes="1"/>
- <field type="INT64" name="counter_value"/>
+ <field type="INT64" name="counter-value"/>
</reply>
</request>
<request name="Await" opcode="7">
- <list type="WAITCONDITION" name="wait_list"/>
+ <list type="WAITCONDITION" name="wait-list"/>
</request>
<request name="ChangeCounter" opcode="4">
<field type="COUNTER" name="counter"/>
@@ -98,11 +98,11 @@ for licensing information.
</request>
<request name="CreateAlarm" opcode="8">
<field type="ALARM" name="id"/>
- <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="ChangeAlarm" opcode="9">
<field type="ALARM" name="id"/>
- <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="DestroyAlarm" opcode="11">
<field type="ALARM" name="alarm"/>
@@ -131,8 +131,8 @@ for licensing information.
<event name="CounterNotify" number="0">
<field type="CARD8" name="kind"/>
<field type="COUNTER" name="counter"/>
- <field type="INT64" name="wait_value"/>
- <field type="INT64" name="counter_value"/>
+ <field type="INT64" name="wait-value"/>
+ <field type="INT64" name="counter-value"/>
<field type="TIMESTAMP" name="timestamp"/>
<field type="CARD16" name="count"/>
<field type="BOOL" name="destroyed"/>
@@ -140,8 +140,8 @@ for licensing information.
<event name="AlarmNotify" number="1">
<field type="CARD8" name="kind"/>
<field type="ALARM" name="alarm"/>
- <field type="INT64" name="counter_value"/>
- <field type="INT64" name="alarm_value"/>
+ <field type="INT64" name="counter-value"/>
+ <field type="INT64" name="alarm-value"/>
<field type="TIMESTAMP" name="timestamp"/>
</event>
</xcb>
diff --git a/xcb-proto/src/extensions/xc_misc.xml b/xcb-proto/src/extensions/xc_misc.xml
index 0af8de8..c681792 100644
--- a/xcb-proto/src/extensions/xc_misc.xml
+++ b/xcb-proto/src/extensions/xc_misc.xml
@@ -6,18 +6,18 @@ for licensing information.
-->
<xcb header="xc_misc" extension-xname="XC-MISC" extension-name="XCMisc">
<request name="GetVersion" opcode="0">
- <field type="CARD16" name="client_major_version"/>
- <field type="CARD16" name="client_minor_version"/>
+ <field type="CARD16" name="client-major-version"/>
+ <field type="CARD16" name="client-minor-version"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="server_major_version"/>
- <field type="CARD16" name="server_minor_version"/>
+ <field type="CARD16" name="server-major-version"/>
+ <field type="CARD16" name="server-minor-version"/>
</reply>
</request>
<request name="GetXIDRange" opcode="1">
<reply>
<pad bytes="1"/>
- <field type="XID" name="start_id"/>
+ <field type="XID" name="start-id"/>
<field type="CARD32" name="count"/>
</reply>
</request>
@@ -25,10 +25,10 @@ for licensing information.
<field type="CARD32" name="count"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="ids_len"/>
+ <field type="CARD32" name="ids-len"/>
<pad bytes="20"/>
<list type="XID" name="ids">
- <fieldref>ids_len</fieldref>
+ <fieldref>ids-len</fieldref>
</list>
</reply>
</request>
diff --git a/xcb-proto/src/extensions/xevie.xml b/xcb-proto/src/extensions/xevie.xml
index ae69a57..d4f09ca 100644
--- a/xcb-proto/src/extensions/xevie.xml
+++ b/xcb-proto/src/extensions/xevie.xml
@@ -27,12 +27,12 @@ authorization from the authors.
<!-- This file describes version 1 of XEVIE. -->
<xcb header="xevie" extension-xname="XEVIE" extension-name="Xevie">
<request name="QueryVersion" opcode="0">
- <field type="CARD16" name="client_major_version"/>
- <field type="CARD16" name="client_minor_version"/>
+ <field type="CARD16" name="client-major-version"/>
+ <field type="CARD16" name="client-minor-version"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="server_major_version"/>
- <field type="CARD16" name="server_minor_version"/>
+ <field type="CARD16" name="server-major-version"/>
+ <field type="CARD16" name="server-minor-version"/>
<pad bytes="20"/>
</reply>
</request>
@@ -51,8 +51,8 @@ authorization from the authors.
</reply>
</request>
<enum name="Datatype">
- <item name="Unmodified"/>
- <item name="Modified"/>
+ <item name="unmodified"/>
+ <item name="modified"/>
</enum>
<!-- The Send request needs to send an arbitrary Event; this type is used
to reserve the necessary structure size. -->
@@ -62,7 +62,7 @@ authorization from the authors.
<request name="Send" opcode="3">
<field type="Event" name="event"/>
<!-- Datatype -->
- <field type="CARD32" name="data_type"/>
+ <field type="CARD32" name="data-type"/>
<pad bytes="64"/>
<reply>
<pad bytes="1"/>
@@ -70,7 +70,7 @@ authorization from the authors.
</reply>
</request>
<request name="SelectInput" opcode="4">
- <field type="CARD32" name="event_mask"/>
+ <field type="CARD32" name="event-mask"/>
<reply>
<pad bytes="1"/>
<pad bytes="24"/>
diff --git a/xcb-proto/src/extensions/xf86dri.xml b/xcb-proto/src/extensions/xf86dri.xml
index e17d6ed..79f440c 100644
--- a/xcb-proto/src/extensions/xf86dri.xml
+++ b/xcb-proto/src/extensions/xf86dri.xml
@@ -38,30 +38,30 @@ authorization from the authors.
<request name="QueryVersion" opcode="0">
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="dri_major_version"/>
- <field type="CARD16" name="dri_minor_version"/>
- <field type="CARD32" name="dri_minor_patch"/>
+ <field type="CARD16" name="dri-major-version"/>
+ <field type="CARD16" name="dri-minor-version"/>
+ <field type="CARD32" name="dri-minor-patch"/>
</reply>
</request>
<request name="QueryDirectRenderingCapable" opcode="1">
<field type="CARD32" name="screen"/>
<reply>
<pad bytes="1"/>
- <field type="BOOL" name="is_capable"/>
+ <field type="BOOL" name="is-capable"/>
</reply>
</request>
<request name="OpenConnection" opcode="2">
<field type="CARD32" name="screen"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="drm_client_key_low"/>
- <field type="CARD32" name="drm_client_key_high"/>
- <field type="CARD32" name="sarea_handle_low"/>
- <field type="CARD32" name="sarea_handle_high"/>
- <field type="CARD32" name="bus_id_len"/>
+ <field type="CARD32" name="drm-client-key-low"/>
+ <field type="CARD32" name="drm-client-key-high"/>
+ <field type="CARD32" name="sarea-handle-low"/>
+ <field type="CARD32" name="sarea-handle-high"/>
+ <field type="CARD32" name="bus-id-len"/>
<pad bytes="12"/>
- <list type="CARD8" name="bus_id">
- <fieldref>bus_id_len</fieldref>
+ <list type="CARD8" name="bus-id">
+ <fieldref>bus-id-len</fieldref>
</list>
</reply>
</request>
@@ -72,13 +72,13 @@ authorization from the authors.
<field type="CARD32" name="screen"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="client_driver_major_version"/>
- <field type="CARD32" name="client_driver_minor_version"/>
- <field type="CARD32" name="client_driver_patch_version"/>
- <field type="CARD32" name="client_driver_name_len"/>
+ <field type="CARD32" name="client-driver-major-version"/>
+ <field type="CARD32" name="client-driver-minor-version"/>
+ <field type="CARD32" name="client-driver-patch-version"/>
+ <field type="CARD32" name="client-driver-name-len"/>
<pad bytes="8"/>
- <list type="CARD8" name="client_driver_name">
- <fieldref>client_driver_name_len</fieldref>
+ <list type="CARD8" name="client-driver-name">
+ <fieldref>client-driver-name-len</fieldref>
</list>
</reply>
</request>
@@ -88,7 +88,7 @@ authorization from the authors.
<field type="CARD32" name="context"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="hw_context"/>
+ <field type="CARD32" name="hw-context"/>
</reply>
</request>
<request name="DestroyContext" opcode="6">
@@ -100,7 +100,7 @@ authorization from the authors.
<field type="CARD32" name="drawable"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="hw_drawable_handle"/>
+ <field type="CARD32" name="hw-drawable-handle"/>
</reply>
</request>
<request name="DestroyDrawable" opcode="8">
@@ -112,16 +112,16 @@ authorization from the authors.
<field type="CARD32" name="drawable"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="drawable_table_index"/>
- <field type="CARD32" name="drawable_table_stamp"/>
- <field type="INT16" name="drawable_origin_X"/>
- <field type="INT16" name="drawable_origin_Y"/>
- <field type="INT16" name="drawable_size_W"/>
- <field type="INT16" name="drawable_size_H"/>
- <field type="CARD32" name="num_clip_rects"/>
+ <field type="CARD32" name="drawable-table-index"/>
+ <field type="CARD32" name="drawable-table-stamp"/>
+ <field type="INT16" name="drawable-origin-x"/>
+ <field type="INT16" name="drawable-origin-y"/>
+ <field type="INT16" name="drawable-size-w"/>
+ <field type="INT16" name="drawable-size-h"/>
+ <field type="CARD32" name="num-clip-rects"/>
<pad bytes="4"/>
- <list type="DrmClipRect" name="clip_rects">
- <fieldref>num_clip_rects</fieldref>
+ <list type="DrmClipRect" name="clip-rects">
+ <fieldref>num-clip-rects</fieldref>
</list>
</reply>
</request>
@@ -129,14 +129,14 @@ authorization from the authors.
<field type="CARD32" name="screen"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="framebuffer_handle_low"/>
- <field type="CARD32" name="framebuffer_handle_high"/>
- <field type="CARD32" name="framebuffer_origin_offset"/>
- <field type="CARD32" name="framebuffer_size"/>
- <field type="CARD32" name="framebuffer_stride"/>
- <field type="CARD32" name="device_private_size"/>
- <list type="CARD32" name="device_private">
- <fieldref>device_private_size</fieldref>
+ <field type="CARD32" name="framebuffer-handle-low"/>
+ <field type="CARD32" name="framebuffer-handle-high"/>
+ <field type="CARD32" name="framebuffer-origin-offset"/>
+ <field type="CARD32" name="framebuffer-size"/>
+ <field type="CARD32" name="framebuffer-stride"/>
+ <field type="CARD32" name="device-private-size"/>
+ <list type="CARD32" name="device-private">
+ <fieldref>device-private-size</fieldref>
</list>
</reply>
</request>
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index 3a0bf1b..cc62122 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -30,26 +30,26 @@ authorization from the authors.
<import>shape</import>
<!-- Version 1 -->
<request name="QueryVersion" opcode="0">
- <field type="CARD32" name="client_major_version"/>
- <field type="CARD32" name="client_minor_version"/>
+ <field type="CARD32" name="client-major-version"/>
+ <field type="CARD32" name="client-minor-version"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="major_version"/>
- <field type="CARD32" name="minor_version"/>
+ <field type="CARD32" name="major-version"/>
+ <field type="CARD32" name="minor-version"/>
<pad bytes="16"/>
</reply>
</request>
<enum name="SaveSetMode">
- <item name="Insert"/>
- <item name="Delete"/>
+ <item name="insert"/>
+ <item name="delete"/>
</enum>
<enum name="SaveSetTarget">
- <item name="Nearest"/>
- <item name="Root"/>
+ <item name="nearest"/>
+ <item name="root"/>
</enum>
<enum name="SaveSetMapping">
- <item name="Map"/>
- <item name="Unmap"/>
+ <item name="map"/>
+ <item name="unmap"/>
</enum>
<request name="ChangeSaveSet" opcode="1">
<field type="BYTE" name="mode"/>
@@ -62,24 +62,24 @@ authorization from the authors.
<field type="WINDOW" name="window"/>
</request>
<enum name="SelectionEvent">
- <item name="SetSelectionOwner"/>
- <item name="SelectionWindowDestroy"/>
- <item name="SelectionClientClose"/>
+ <item name="set-selection-owner"/>
+ <item name="selection-window-destroy"/>
+ <item name="selection-client-close"/>
</enum>
<enum name="SelectionEventMask">
- <item name="SetSelectionOwner">
+ <item name="set-selection-owner">
<op op="<<">
<value>1</value>
<value>0</value>
</op>
</item>
- <item name="SelectionWindowDestroy">
+ <item name="selection-window-destroy">
<op op="<<">
<value>1</value>
<value>1</value>
</op>
</item>
- <item name="SelectionClientClose">
+ <item name="selection-client-close">
<op op="<<">
<value>1</value>
<value>2</value>
@@ -93,20 +93,20 @@ authorization from the authors.
<field type="WINDOW" name="owner"/>
<field type="ATOM" name="selection"/>
<field type="TIMESTAMP" name="time"/>
- <field type="TIMESTAMP" name="selection_time"/>
+ <field type="TIMESTAMP" name="selection-time"/>
<pad bytes="8"/>
</event>
<request name="SelectSelectionInput" opcode="2">
<field type="WINDOW" name="window"/>
<field type="ATOM" name="selection"/>
- <field type="CARD32" name="event_mask"/>
+ <field type="CARD32" name="event-mask"/>
<!-- SelectionEventMask -->
</request>
<enum name="CursorNotify">
- <item name="DisplayCursor"/>
+ <item name="display-cursor"/>
</enum>
<enum name="CursorNotifyMask">
- <item name="DisplayCursor">
+ <item name="display-cursor">
<op op="<<">
<value>1</value>
<value>0</value>
@@ -117,7 +117,7 @@ authorization from the authors.
<field type="CARD8" name="subtype"/>
<!-- CursorNotify -->
<field type="WINDOW" name="window"/>
- <field type="CARD32" name="cursor_serial"/>
+ <field type="CARD32" name="cursor-serial"/>
<field type="TIMESTAMP" name="time"/>
<field type="ATOM" name="name"/>
<!-- Added in version 2 -->
@@ -126,17 +126,17 @@ authorization from the authors.
<request name="SelectCursorInput" opcode="3">
<field type="WINDOW" name="window"/>
<!-- CursorNotifyMask -->
- <field type="CARD32" name="event_mask"/>
+ <field type="CARD32" name="event-mask"/>
</request>
<request name="GetCursorImage" opcode="4">
<reply>
<pad bytes="1"/>
<field type="RECTANGLE"/>
- <field type="POINT" name="hot_point"/>
- <field type="CARD32" name="cursor_serial"/>
+ <field type="POINT" name="hot-point"/>
+ <field type="CARD32" name="cursor-serial"/>
<pad bytes="8"/>
<!-- FIXME: refers to anonymous fields -->
- <list type="CARD32" name="cursor_image">
+ <list type="CARD32" name="cursor-image">
<op op="*">
<fieldref>width</fieldref>
<fieldref>height</fieldref>
@@ -225,7 +225,7 @@ authorization from the authors.
</request>
<request name="SetWindowShapeRegion" opcode="21">
<field type="WINDOW" name="dest"/>
- <field type="SHAPE_KIND" name="dest_kind"/>
+ <field type="SHAPE_KIND" name="dest-kind"/>
<pad bytes="3"/>
<field type="POINT" name="offset"/>
<field type="REGION" name="region"/>
@@ -259,15 +259,15 @@ authorization from the authors.
<reply>
<pad bytes="1"/>
<field type="RECTANGLE"/>
- <field type="POINT" name="hot_point"/>
- <field type="CARD32" name="cursor_serial"/>
- <field type="ATOM" name="cursor_atom"/>
+ <field type="POINT" name="hot-point"/>
+ <field type="CARD32" name="cursor-serial"/>
+ <field type="ATOM" name="cursor-atom"/>
<field type="CARD16" name="nbytes"/>
<pad bytes="2"/>
<list type="CARD8" name="name">
<fieldref>nbytes</fieldref>
</list>
- <list type="CARD32" name="cursor_image">
+ <list type="CARD32" name="cursor-image">
<op op="*">
<fieldref>width</fieldref>
<fieldref>height</fieldref>
diff --git a/xcb-proto/src/extensions/xprint.xml b/xcb-proto/src/extensions/xprint.xml
index 9a5f81a..5abebaa 100644
--- a/xcb-proto/src/extensions/xprint.xml
+++ b/xcb-proto/src/extensions/xprint.xml
@@ -29,14 +29,14 @@ authorization from the authors.
<!-- Conforms to XPRINT 1.0 -->
<!-- Types -->
<struct name="PRINTER">
- <field type="CARD32" name="nameLen"/>
+ <field type="CARD32" name="name-len"/>
<list type="STRING8" name="name">
- <fieldref>nameLen</fieldref>
+ <fieldref>name-len</fieldref>
</list>
<!-- Padding -->
- <field type="CARD32" name="descLen"/>
+ <field type="CARD32" name="desc-len"/>
<list type="STRING8" name="description">
- <fieldref>descLen</fieldref>
+ <fieldref>desc-len</fieldref>
</list>
<!-- More padding -->
</struct>
@@ -45,67 +45,67 @@ authorization from the authors.
<typedef oldname="char" newname="STRING8"/>
<!-- "PrintGetDocumentData" -->
<enum name="GetDoc">
- <item name="Finished">
+ <item name="finished">
<value>0</value>
</item>
- <item name="SecondConsumer">
+ <item name="second-consumer">
<value>1</value>
</item>
</enum>
<!-- Event Mask ("PrintSelectInput") -->
<enum name="EvMask">
- <item name="NoEventMask">
+ <item name="no-event-mask">
<value>0x00000000</value>
</item>
- <item name="PrintMask">
+ <item name="print-mask">
<value>0x00000001</value>
</item>
- <item name="AttributeMask">
+ <item name="attribute-mask">
<value>0x00000002</value>
</item>
</enum>
<!-- "PrintNotify" detail -->
<enum name="Detail">
- <item name="StartJobNotify">
+ <item name="start-job-notify">
<value>1</value>
</item>
- <item name="EndJobNotify">
+ <item name="end-job-notify">
<value>2</value>
</item>
- <item name="StartDocNotify">
+ <item name="start-doc-notify">
<value>3</value>
</item>
- <item name="EndDocNotify">
+ <item name="end-doc-notify">
<value>4</value>
</item>
- <item name="StartPageNotify">
+ <item name="start-page-notify">
<value>5</value>
</item>
- <item name="EndPageNotify">
+ <item name="end-page-notify">
<value>6</value>
</item>
</enum>
<!-- "AttributeNotify" detail -->
<enum name="Attr">
- <item name="JobAttr">
+ <item name="job-attr">
<value>1</value>
</item>
- <item name="DocAttr">
+ <item name="doc-attr">
<value>2</value>
</item>
- <item name="PageAttr">
+ <item name="page-attr">
<value>3</value>
</item>
- <item name="PrinterAttr">
+ <item name="printer-attr">
<value>4</value>
</item>
- <item name="ServerAttr">
+ <item name="server-attr">
<value>5</value>
</item>
- <item name="MediumAttr">
+ <item name="medium-attr">
<value>6</value>
</item>
- <item name="SpoolerAttr">
+ <item name="spooler-attr">
<value>7</value>
</item>
</enum>
@@ -113,40 +113,40 @@ authorization from the authors.
<request name="PrintQueryVersion" opcode="0">
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="major_version"/>
- <field type="CARD16" name="minor_version"/>
+ <field type="CARD16" name="major-version"/>
+ <field type="CARD16" name="minor-version"/>
</reply>
</request>
<request name="PrintGetPrinterList" opcode="1">
- <field type="CARD32" name="printerNameLen"/>
- <field type="CARD32" name="localeLen"/>
- <list type="STRING8" name="printer_name">
- <fieldref>printerNameLen</fieldref>
+ <field type="CARD32" name="printer-name-len"/>
+ <field type="CARD32" name="locale-len"/>
+ <list type="STRING8" name="printer-name">
+ <fieldref>printer-name-len</fieldref>
</list>
<!-- There's some padding in here... -->
<list type="STRING8" name="locale">
- <fieldref>localeLen</fieldref>
+ <fieldref>locale-len</fieldref>
</list>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="listCount"/>
+ <field type="CARD32" name="list-count"/>
<pad bytes="20"/>
<list type="PRINTER" name="printers">
- <fieldref>listCount</fieldref>
+ <fieldref>list-count</fieldref>
</list>
</reply>
</request>
<request name="PrintRehashPrinterList" opcode="20"/>
<request name="CreateContext" opcode="2">
- <field type="CARD32" name="context_id"/>
- <field type="CARD32" name="printerNameLen"/>
- <field type="CARD32" name="localeLen"/>
- <list type="STRING8" name="printerName">
- <fieldref>printerNameLen</fieldref>
+ <field type="CARD32" name="context-id"/>
+ <field type="CARD32" name="printer-name-len"/>
+ <field type="CARD32" name="locale-len"/>
+ <list type="STRING8" name="printer-name">
+ <fieldref>printer-name-len</fieldref>
</list>
<!-- padding -->
<list type="STRING8" name="locale">
- <fieldref>localeLen</fieldref>
+ <fieldref>locale-len</fieldref>
</list>
</request>
<request name="PrintSetContext" opcode="3">
@@ -168,41 +168,41 @@ authorization from the authors.
</reply>
</request>
<request name="PrintStartJob" opcode="7">
- <field type="CARD8" name="output_mode"/>
+ <field type="CARD8" name="output-mode"/>
</request>
<request name="PrintEndJob" opcode="8">
<field type="BOOL" name="cancel"/>
</request>
<request name="PrintStartDoc" opcode="9">
- <field type="CARD8" name="driver_mode"/>
+ <field type="CARD8" name="driver-mode"/>
</request>
<request name="PrintEndDoc" opcode="10">
<field type="BOOL" name="cancel"/>
</request>
<request name="PrintPutDocumentData" opcode="11">
<field type="DRAWABLE" name="drawable"/>
- <field type="CARD32" name="len_data"/>
- <field type="CARD16" name="len_fmt"/>
- <field type="CARD16" name="len_options"/>
+ <field type="CARD32" name="len-data"/>
+ <field type="CARD16" name="len-fmt"/>
+ <field type="CARD16" name="len-options"/>
<list type="BYTE" name="data">
- <fieldref>len_data</fieldref>
+ <fieldref>len-data</fieldref>
</list>
<!-- padding -->
- <list type="STRING8" name="doc_format"/>
+ <list type="STRING8" name="doc-format"/>
<!-- padding -->
<list type="STRING8" name="options"/>
</request>
<request name="PrintGetDocumentData" opcode="12">
<field type="PCONTEXT" name="context"/>
- <field type="CARD32" name="max_bytes"/>
+ <field type="CARD32" name="max-bytes"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="status_code"/>
- <field type="CARD32" name="finished_flag"/>
- <field type="CARD32" name="dataLen"/>
+ <field type="CARD32" name="status-code"/>
+ <field type="CARD32" name="finished-flag"/>
+ <field type="CARD32" name="data-len"/>
<pad bytes="12"/>
<list type="BYTE" name="data">
- <fieldref>dataLen</fieldref>
+ <fieldref>data-len</fieldref>
</list>
</reply>
</request>
@@ -215,14 +215,14 @@ authorization from the authors.
</request>
<request name="PrintSelectInput" opcode="15">
<field type="PCONTEXT" name="context"/>
- <valueparam value-mask-type="CARD32" value-mask-name="event_mask" value-list-name="event_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="event-mask" value-list-name="event-list"/>
</request>
<request name="PrintInputSelected" opcode="16">
<field type="PCONTEXT" name="context"/>
<reply>
<pad bytes="1"/>
- <valueparam value-mask-type="CARD32" value-mask-name="event_mask" value-list-name="event_list"/>
- <valueparam value-mask-type="CARD32" value-mask-name="all_events_mask" value-list-name="all_events_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="event-mask" value-list-name="event-list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="all-events-mask" value-list-name="all-events-list"/>
</reply>
</request>
<request name="PrintGetAttributes" opcode="17">
@@ -231,31 +231,31 @@ authorization from the authors.
<pad bytes="3"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="stringLen"/>
+ <field type="CARD32" name="string-len"/>
<pad bytes="20"/>
<field type="STRING8" name="attributes"/>
</reply>
</request>
<request name="PrintGetOneAttributes" opcode="19">
<field type="PCONTEXT" name="context"/>
- <field type="CARD32" name="nameLen"/>
+ <field type="CARD32" name="name-len"/>
<field type="CARD8" name="pool"/>
<pad bytes="3"/>
<list type="STRING8" name="name">
- <fieldref>nameLen</fieldref>
+ <fieldref>name-len</fieldref>
</list>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="valueLen"/>
+ <field type="CARD32" name="value-len"/>
<pad bytes="20"/>
<list type="STRING8" name="value">
- <fieldref>valueLen</fieldref>
+ <fieldref>value-len</fieldref>
</list>
</reply>
</request>
<request name="PrintSetAttributes" opcode="18">
<field type="PCONTEXT" name="context"/>
- <field type="CARD32" name="stringLen"/>
+ <field type="CARD32" name="string-len"/>
<field type="CARD8" name="pool"/>
<field type="CARD8" name="rule"/>
<pad bytes="2"/>
@@ -267,36 +267,36 @@ authorization from the authors.
<pad bytes="1"/>
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
- <field type="CARD16" name="offset_x"/>
- <field type="CARD16" name="offset_y"/>
- <field type="CARD16" name="reproducible_width"/>
- <field type="CARD16" name="reproducible_height"/>
+ <field type="CARD16" name="offset-x"/>
+ <field type="CARD16" name="offset-y"/>
+ <field type="CARD16" name="reproducible-width"/>
+ <field type="CARD16" name="reproducible-height"/>
</reply>
</request>
<request name="PrintQueryScreens" opcode="22">
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="listCount"/>
+ <field type="CARD32" name="list-count"/>
<pad bytes="20"/>
<list type="WINDOW" name="roots">
- <fieldref>listCount</fieldref>
+ <fieldref>list-count</fieldref>
</list>
<!-- There may be a WINDOW rootWindow here... -->
</reply>
</request>
<request name="PrintSetImageResolution" opcode="23">
<field type="PCONTEXT" name="context"/>
- <field type="CARD16" name="image_resolution"/>
+ <field type="CARD16" name="image-resolution"/>
<reply>
<field type="BOOL" name="status"/>
- <field type="CARD16" name="previous_resolutions"/>
+ <field type="CARD16" name="previous-resolutions"/>
</reply>
</request>
<request name="PrintGetImageResolution" opcode="24">
<field type="PCONTEXT" name="context"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="image_resolution"/>
+ <field type="CARD16" name="image-resolution"/>
</reply>
</request>
<!-- Events -->
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index 07d7a5e..b3e3a29 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -32,35 +32,35 @@ authorization from the authors.
<xidtype name="PORT"/>
<xidtype name="ENCODING"/>
<enum name="Type">
- <item name="InputMask">
+ <item name="input-mask">
<value>0x00000001</value>
</item>
- <item name="OutputMask">
+ <item name="output-mask">
<value>0x00000002</value>
</item>
- <item name="VideoMask">
+ <item name="video-mask">
<value>0x00000004</value>
</item>
- <item name="StillMask">
+ <item name="still-mask">
<value>0x00000008</value>
</item>
- <item name="ImageMask">
+ <item name="image-mask">
<value>0x00000010</value>
</item>
</enum>
<enum name="ImageFormatInfoType">
- <item name="RGB"/>
- <item name="YUV"/>
+ <item name="rgb"/>
+ <item name="yuv"/>
</enum>
<enum name="ImageFormatInfoFormat">
- <item name="Packed"/>
- <item name="Planar"/>
+ <item name="packed"/>
+ <item name="planar"/>
</enum>
<enum name="AttributeFlag">
- <item name="Gettable">
+ <item name="gettable">
<value>0x01</value>
</item>
- <item name="Settable">
+ <item name="settable">
<value>0x02</value>
</item>
</enum>
@@ -69,22 +69,22 @@ authorization from the authors.
<field type="INT32" name="denominator"/>
</struct>
<struct name="AdaptorInfo">
- <field type="PORT" name="base_id"/>
- <field type="CARD16" name="name_size"/>
- <field type="CARD16" name="num_ports"/>
- <field type="CARD16" name="num_formats"/>
+ <field type="PORT" name="base-id"/>
+ <field type="CARD16" name="name-size"/>
+ <field type="CARD16" name="num-ports"/>
+ <field type="CARD16" name="num-formats"/>
<field type="CARD8" name="type"/>
<field type="CARD8" name="pad"/>
<list type="char" name="name">
- <fieldref>name_size</fieldref>
+ <fieldref>name-size</fieldref>
</list>
<list type="Format" name="formats">
- <fieldref>num_formats</fieldref>
+ <fieldref>num-formats</fieldref>
</list>
</struct>
<struct name="EncodingInfo">
<field type="ENCODING" name="encoding"/>
- <field type="CARD16" name="name_size"/>
+ <field type="CARD16" name="name-size"/>
<field type="SIZE"/>
<field type="Rational" name="rate"/>
<!--
@@ -92,7 +92,7 @@ authorization from the authors.
overlaps.
-->
<list type="char" name="name">
- <fieldref>name_size</fieldref>
+ <fieldref>name-size</fieldref>
</list>
</struct>
<struct name="Format">
@@ -102,16 +102,16 @@ authorization from the authors.
<struct name="Image">
<field type="CARD32" name="id"/>
<field type="SIZE"/>
- <field type="CARD32" name="data_size"/>
- <field type="CARD32" name="num_planes"/>
+ <field type="CARD32" name="data-size"/>
+ <field type="CARD32" name="num-planes"/>
<list type="CARD32" name="pitches">
- <fieldref>num_planes</fieldref>
+ <fieldref>num-planes</fieldref>
</list>
<list type="CARD32" name="offsets">
- <fieldref>num_planes</fieldref>
+ <fieldref>num-planes</fieldref>
</list>
<list type="CARD8" name="data">
- <fieldref>data_size</fieldref>
+ <fieldref>data-size</fieldref>
</list>
<!-- Some XPointer "obdata" for SHM use-->
</struct>
@@ -127,36 +127,36 @@ authorization from the authors.
<struct name="ImageFormatInfo">
<field type="CARD32" name="id"/>
<field type="CARD8" name="type"/>
- <field type="CARD8" name="byte_order"/>
+ <field type="CARD8" name="byte-order"/>
<field type="CARD16" name="pad1"/>
<list type="CARD8" name="guid">
<value>16</value>
</list>
<field type="CARD8" name="bpp"/>
- <field type="CARD8" name="num_planes"/>
+ <field type="CARD8" name="num-planes"/>
<field type="CARD16" name="pad2"/>
<field type="CARD8" name="depth"/>
<field type="CARD8" name="pad3"/>
<field type="CARD16" name="pad4"/>
- <field type="CARD32" name="red_mask"/>
- <field type="CARD32" name="green_mask"/>
- <field type="CARD32" name="blue_mask"/>
+ <field type="CARD32" name="red-mask"/>
+ <field type="CARD32" name="green-mask"/>
+ <field type="CARD32" name="blue-mask"/>
<field type="CARD8" name="format"/>
<field type="CARD8" name="pad5"/>
<field type="CARD16" name="pad6"/>
- <field type="CARD32" name="y_sample_bits"/>
- <field type="CARD32" name="u_sample_bits"/>
- <field type="CARD32" name="v_sample_bits"/>
- <field type="CARD32" name="vhorz_y_period"/>
- <field type="CARD32" name="vhorz_u_period"/>
- <field type="CARD32" name="vhorz_v_period"/>
- <field type="CARD32" name="vvert_y_period"/>
- <field type="CARD32" name="vvert_u_period"/>
- <field type="CARD32" name="vvert_v_period"/>
- <list type="CARD8" name="vcomp_order">
+ <field type="CARD32" name="y-sample-bits"/>
+ <field type="CARD32" name="u-sample-bits"/>
+ <field type="CARD32" name="v-sample-bits"/>
+ <field type="CARD32" name="vhorz-y-period"/>
+ <field type="CARD32" name="vhorz-u-period"/>
+ <field type="CARD32" name="vhorz-v-period"/>
+ <field type="CARD32" name="vvert-y-period"/>
+ <field type="CARD32" name="vvert-u-period"/>
+ <field type="CARD32" name="vvert-v-period"/>
+ <list type="CARD8" name="vcomp-order">
<value>32</value>
</list>
- <field type="CARD8" name="vscanline_order"/>
+ <field type="CARD8" name="vscanline-order"/>
<field type="CARD8" name="vpad7"/>
<field type="CARD16" name="vpad8"/>
<field type="CARD32" name="vpad9"/>
@@ -191,10 +191,10 @@ authorization from the authors.
<field type="WINDOW" name="window"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="num_adaptors"/>
+ <field type="CARD16" name="num-adaptors"/>
<pad bytes="22"/>
<list type="AdaptorInfo" name="info">
- <fieldref>num_adaptors</fieldref>
+ <fieldref>num-adaptors</fieldref>
</list>
</reply>
</request>
@@ -202,14 +202,14 @@ authorization from the authors.
<field type="PORT" name="port"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="num_encodings"/>
+ <field type="CARD16" name="num-encodings"/>
<!--
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>
+ <fieldref>num-encodings</fieldref>
</list>
</reply>
</request>
@@ -228,53 +228,53 @@ authorization from the authors.
<field type="PORT" name="port"/>
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
- <field type="INT16" name="vid_x"/>
- <field type="INT16" name="vid_y"/>
- <field type="CARD16" name="vid_w"/>
- <field type="CARD16" name="vid_h"/>
- <field type="INT16" name="drw_x"/>
- <field type="INT16" name="drw_y"/>
- <field type="CARD16" name="drw_w"/>
- <field type="CARD16" name="drw_h"/>
+ <field type="INT16" name="vid-x"/>
+ <field type="INT16" name="vid-y"/>
+ <field type="CARD16" name="vid-w"/>
+ <field type="CARD16" name="vid-h"/>
+ <field type="INT16" name="drw-x"/>
+ <field type="INT16" name="drw-y"/>
+ <field type="CARD16" name="drw-w"/>
+ <field type="CARD16" name="drw-h"/>
</request>
<request name="PutStill" opcode="6">
<field type="PORT" name="port"/>
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
- <field type="INT16" name="vid_x"/>
- <field type="INT16" name="vid_y"/>
- <field type="CARD16" name="vid_w"/>
- <field type="CARD16" name="vid_h"/>
- <field type="INT16" name="drw_x"/>
- <field type="INT16" name="drw_y"/>
- <field type="CARD16" name="drw_w"/>
- <field type="CARD16" name="drw_h"/>
+ <field type="INT16" name="vid-x"/>
+ <field type="INT16" name="vid-y"/>
+ <field type="CARD16" name="vid-w"/>
+ <field type="CARD16" name="vid-h"/>
+ <field type="INT16" name="drw-x"/>
+ <field type="INT16" name="drw-y"/>
+ <field type="CARD16" name="drw-w"/>
+ <field type="CARD16" name="drw-h"/>
</request>
<request name="GetVideo" opcode="7">
<field type="PORT" name="port"/>
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
- <field type="INT16" name="vid_x"/>
- <field type="INT16" name="vid_y"/>
- <field type="CARD16" name="vid_w"/>
- <field type="CARD16" name="vid_h"/>
- <field type="INT16" name="drw_x"/>
- <field type="INT16" name="drw_y"/>
- <field type="CARD16" name="drw_w"/>
- <field type="CARD16" name="drw_h"/>
+ <field type="INT16" name="vid-x"/>
+ <field type="INT16" name="vid-y"/>
+ <field type="CARD16" name="vid-w"/>
+ <field type="CARD16" name="vid-h"/>
+ <field type="INT16" name="drw-x"/>
+ <field type="INT16" name="drw-y"/>
+ <field type="CARD16" name="drw-w"/>
+ <field type="CARD16" name="drw-h"/>
</request>
<request name="GetStill" opcode="8">
<field type="PORT" name="port"/>
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
- <field type="INT16" name="vid_x"/>
- <field type="INT16" name="vid_y"/>
- <field type="CARD16" name="vid_w"/>
- <field type="CARD16" name="vid_h"/>
- <field type="INT16" name="drw_x"/>
- <field type="INT16" name="drw_y"/>
- <field type="CARD16" name="drw_w"/>
- <field type="CARD16" name="drw_h"/>
+ <field type="INT16" name="vid-x"/>
+ <field type="INT16" name="vid-y"/>
+ <field type="CARD16" name="vid-w"/>
+ <field type="CARD16" name="vid-h"/>
+ <field type="INT16" name="drw-x"/>
+ <field type="INT16" name="drw-y"/>
+ <field type="CARD16" name="drw-w"/>
+ <field type="CARD16" name="drw-h"/>
</request>
<request name="StopVideo" opcode="9">
<field type="PORT" name="port"/>
@@ -290,14 +290,14 @@ authorization from the authors.
</request>
<request name="QueryBestSize" opcode="12">
<field type="PORT" name="port"/>
- <field type="CARD16" name="vid_w"/>
- <field type="CARD16" name="vid_h"/>
- <field type="CARD16" name="drw_w"/>
- <field type="CARD16" name="drw_h"/>
+ <field type="CARD16" name="vid-w"/>
+ <field type="CARD16" name="vid-h"/>
+ <field type="CARD16" name="drw-w"/>
+ <field type="CARD16" name="drw-h"/>
<field type="BOOL" name="motion"/>
<reply>
<pad bytes="1"/>
- <field type="SIZE" name="actual_size"/>
+ <field type="SIZE" name="actual-size"/>
</reply>
</request>
<request name="SetPortAttribute" opcode="13">
@@ -318,11 +318,11 @@ authorization from the authors.
<field type="PORT" name="port"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="num_attributes"/>
- <field type="CARD32" name="text_size"/>
+ <field type="CARD32" name="num-attributes"/>
+ <field type="CARD32" name="text-size"/>
<pad bytes="16"/>
<list type="AttributeInfo" name="attributes">
- <fieldref>num_attributes</fieldref>
+ <fieldref>num-attributes</fieldref>
</list>
</reply>
</request>
@@ -330,10 +330,10 @@ authorization from the authors.
<field type="PORT" name="port"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="num_formats"/>
+ <field type="CARD32" name="num-formats"/>
<pad bytes="20"/>
<list type="ImageFormatInfo" name="format">
- <fieldref>num_formats</fieldref>
+ <fieldref>num-formats</fieldref>
</list>
</reply>
</request>
@@ -343,15 +343,15 @@ authorization from the authors.
<field type="SIZE"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="num_planes"/>
- <field type="CARD32" name="data_size"/>
+ <field type="CARD32" name="num-planes"/>
+ <field type="CARD32" name="data-size"/>
<field type="SIZE"/>
<pad bytes="12"/>
<list type="CARD32" name="pitches">
- <fieldref>num_planes</fieldref>
+ <fieldref>num-planes</fieldref>
</list>
<list type="CARD32" name="offsets">
- <fieldref>num_planes</fieldref>
+ <fieldref>num-planes</fieldref>
</list>
</reply>
</request>
@@ -360,19 +360,19 @@ authorization from the authors.
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
<field type="CARD32" name="id"/>
- <field type="INT16" name="src_x"/>
- <field type="INT16" name="src_y"/>
- <field type="CARD16" name="src_w"/>
- <field type="CARD16" name="src_h"/>
- <field type="INT16" name="drw_x"/>
- <field type="INT16" name="drw_y"/>
- <field type="CARD16" name="drw_w"/>
- <field type="CARD16" name="drw_h"/>
+ <field type="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
+ <field type="CARD16" name="src-w"/>
+ <field type="CARD16" name="src-h"/>
+ <field type="INT16" name="drw-x"/>
+ <field type="INT16" name="drw-y"/>
+ <field type="CARD16" name="drw-w"/>
+ <field type="CARD16" name="drw-h"/>
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
<localfield type="CARD32" name="data_size"/>
<list type="CARD8" name="data">
- <fieldref>data_size</fieldref>
+ <fieldref>data-size</fieldref>
</list>
</request>
<request name="ShmPutImage" opcode="19">
@@ -382,16 +382,16 @@ authorization from the authors.
<field type="SEG" name="shmseg"/>
<field type="CARD32" name="id"/>
<field type="CARD32" name="offset"/>
- <field type="INT16" name="src_x"/>
- <field type="INT16" name="src_y"/>
- <field type="CARD16" name="src_w"/>
- <field type="CARD16" name="src_h"/>
- <field type="INT16" name="drw_x"/>
- <field type="INT16" name="drw_y"/>
- <field type="CARD16" name="drw_w"/>
- <field type="CARD16" name="drw_h"/>
+ <field type="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
+ <field type="CARD16" name="src-w"/>
+ <field type="CARD16" name="src-h"/>
+ <field type="INT16" name="drw-x"/>
+ <field type="INT16" name="drw-y"/>
+ <field type="CARD16" name="drw-w"/>
+ <field type="CARD16" name="drw-h"/>
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
- <field type="CARD8" name="send_event"/>
+ <field type="CARD8" name="send-event"/>
</request>
</xcb>
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index 273cd85..6d3d16d 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -32,13 +32,13 @@ authorization from the authors.
<xidtype name="SUBPICTURE"/>
<struct name="SurfaceInfo">
<field type="SURFACE" name="id"/>
- <field type="CARD16" name="chroma_format"/>
+ <field type="CARD16" name="chroma-format"/>
<field type="CARD16" name="pad0"/>
- <field type="CARD16" name="max_width"/>
- <field type="CARD16" name="max_height"/>
- <field type="CARD16" name="subpicture_max_width"/>
- <field type="CARD16" name="subpicture_max_height"/>
- <field type="CARD32" name="mc_type"/>
+ <field type="CARD16" name="max-width"/>
+ <field type="CARD16" name="max-height"/>
+ <field type="CARD16" name="subpicture-max-width"/>
+ <field type="CARD16" name="subpicture-max-height"/>
+ <field type="CARD32" name="mc-type"/>
<field type="CARD32" name="flags"/>
</struct>
<request name="QueryVersion" opcode="0">
@@ -49,7 +49,7 @@ authorization from the authors.
</reply>
</request>
<request name="ListSurfaceTypes" opcode="1">
- <field type="PORT" name="port_id"/>
+ <field type="PORT" name="port-id"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="num"/>
@@ -60,61 +60,61 @@ authorization from the authors.
</reply>
</request>
<request name="CreateContext" opcode="2">
- <field type="CONTEXT" name="context_id"/>
- <field type="PORT" name="port_id"/>
- <field type="SURFACE" name="surface_id"/>
+ <field type="CONTEXT" name="context-id"/>
+ <field type="PORT" name="port-id"/>
+ <field type="SURFACE" name="surface-id"/>
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
<field type="CARD32" name="flags"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="width_actual"/>
- <field type="CARD16" name="height_actual"/>
- <field type="CARD32" name="flags_return"/>
+ <field type="CARD16" name="width-actual"/>
+ <field type="CARD16" name="height-actual"/>
+ <field type="CARD32" name="flags-return"/>
<pad bytes="20"/>
- <list type="CARD32" name="priv_data"/>
+ <list type="CARD32" name="priv-data"/>
</reply>
</request>
<request name="DestroyContext" opcode="3">
- <field type="CONTEXT" name="context_id"/>
+ <field type="CONTEXT" name="context-id"/>
</request>
<request name="CreateSurface" opcode="4">
- <field type="SURFACE" name="surface_id"/>
- <field type="CONTEXT" name="context_id"/>
+ <field type="SURFACE" name="surface-id"/>
+ <field type="CONTEXT" name="context-id"/>
<reply>
<pad bytes="1"/>
<pad bytes="24"/>
- <list type="CARD32" name="priv_data"/>
+ <list type="CARD32" name="priv-data"/>
</reply>
</request>
<request name="DestroySurface" opcode="5">
- <field type="SURFACE" name="surface_id"/>
+ <field type="SURFACE" name="surface-id"/>
</request>
<request name="CreateSubpicture" opcode="6">
- <field type="SUBPICTURE" name="subpicture_id"/>
+ <field type="SUBPICTURE" name="subpicture-id"/>
<field type="CONTEXT" name="context"/>
- <field type="CARD32" name="xvimage_id"/>
+ <field type="CARD32" name="xvimage-id"/>
<field type="CARD16" name="width"/>
<field type="CARD16" name="height"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="width_actual"/>
- <field type="CARD16" name="height_actual"/>
- <field type="CARD16" name="num_palette_entries"/>
- <field type="CARD16" name="entry_bytes"/>
- <list type="CARD8" name="component_order">
+ <field type="CARD16" name="width-actual"/>
+ <field type="CARD16" name="height-actual"/>
+ <field type="CARD16" name="num-palette-entries"/>
+ <field type="CARD16" name="entry-bytes"/>
+ <list type="CARD8" name="component-order">
<value>4</value>
</list>
<pad bytes="12"/>
- <list type="CARD32" name="priv_data"/>
+ <list type="CARD32" name="priv-data"/>
</reply>
</request>
<request name="DestroySubpicture" opcode="7">
- <field type="SUBPICTURE" name="subpicture_id"/>
+ <field type="SUBPICTURE" name="subpicture-id"/>
</request>
<request name="ListSubpictureTypes" opcode="8">
- <field type="PORT" name="port_id"/>
- <field type="SURFACE" name="surface_id"/>
+ <field type="PORT" name="port-id"/>
+ <field type="SURFACE" name="surface-id"/>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="num"/>
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index 5b1dfaf..a772624 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
All Rights Reserved.
@@ -85,49 +85,49 @@ authorization from the authors.
<!-- Connection setup-related types -->
<struct name="FORMAT">
<field type="CARD8" name="depth"/>
- <field type="CARD8" name="bits_per_pixel"/>
- <field type="CARD8" name="scanline_pad"/>
+ <field type="CARD8" name="bits-per-pixel"/>
+ <field type="CARD8" name="scanline-pad"/>
<pad bytes="5"/>
</struct>
<struct name="VISUALTYPE">
- <field type="VISUALID" name="visual_id"/>
+ <field type="VISUALID" name="visual-id"/>
<field type="CARD8" name="class"/>
- <field type="CARD8" name="bits_per_rgb_value"/>
- <field type="CARD16" name="colormap_entries"/>
- <field type="CARD32" name="red_mask"/>
- <field type="CARD32" name="green_mask"/>
- <field type="CARD32" name="blue_mask"/>
+ <field type="CARD8" name="bits-per-rgb-value"/>
+ <field type="CARD16" name="colormap-entries"/>
+ <field type="CARD32" name="red-mask"/>
+ <field type="CARD32" name="green-mask"/>
+ <field type="CARD32" name="blue-mask"/>
<pad bytes="4"/>
</struct>
<struct name="DEPTH">
<field type="CARD8" name="depth"/>
<pad bytes="1"/>
- <field type="CARD16" name="visuals_len"/>
+ <field type="CARD16" name="visuals-len"/>
<pad bytes="4"/>
<list type="VISUALTYPE" name="visuals">
- <fieldref>visuals_len</fieldref>
+ <fieldref>visuals-len</fieldref>
</list>
</struct>
<struct name="ScreenSize">
- <field type="SIZE" name="size_in_pixels"/>
- <field type="SIZE" name="size_in_millimeters"/>
+ <field type="SIZE" name="size-in-pixels"/>
+ <field type="SIZE" name="size-in-millimeters"/>
</struct>
<struct name="SCREEN">
<field type="WINDOW" name="root"/>
- <field type="COLORMAP" name="default_colormap"/>
- <field type="CARD32" name="white_pixel"/>
- <field type="CARD32" name="black_pixel"/>
- <field type="CARD32" name="current_input_masks"/>
+ <field type="COLORMAP" name="default-colormap"/>
+ <field type="CARD32" name="white-pixel"/>
+ <field type="CARD32" name="black-pixel"/>
+ <field type="CARD32" name="current-input-masks"/>
<field type="ScreenSize"/>
- <field type="CARD16" name="min_installed_maps"/>
- <field type="CARD16" name="max_installed_maps"/>
- <field type="VISUALID" name="root_visual"/>
- <field type="BYTE" name="backing_stores"/>
- <field type="BOOL" name="save_unders"/>
- <field type="CARD8" name="root_depth"/>
- <field type="CARD8" name="allowed_depths_len"/>
- <list type="DEPTH" name="allowed_depths">
- <fieldref>allowed_depths_len</fieldref>
+ <field type="CARD16" name="min-installed-maps"/>
+ <field type="CARD16" name="max-installed-maps"/>
+ <field type="VISUALID" name="root-visual"/>
+ <field type="BYTE" name="backing-stores"/>
+ <field type="BOOL" name="save-unders"/>
+ <field type="CARD8" name="root-depth"/>
+ <field type="CARD8" name="allowed-depths-len"/>
+ <list type="DEPTH" name="allowed-depths">
+ <fieldref>allowed-depths-len</fieldref>
</list>
</struct>
<!--
@@ -137,16 +137,16 @@ authorization from the authors.
</struct>
-->
<struct name="ConnSetupReq">
- <field type="CARD8" name="byte_order"/>
+ <field type="CARD8" name="byte-order"/>
<pad bytes="1"/>
- <field type="VERSION" name="protocol_version"/>
- <field type="CARD16" name="authorization_protocol_name_len"/>
- <field type="CARD16" name="authorization_protocol_data_len"/>
- <list type="char" name="authorization_protocol_name">
- <fieldref>authorization_protocol_name_len</fieldref>
+ <field type="VERSION" name="protocol-version"/>
+ <field type="CARD16" name="authorization-protocol-name-len"/>
+ <field type="CARD16" name="authorization-protocol-data-len"/>
+ <list type="char" name="authorization-protocol-name">
+ <fieldref>authorization-protocol-name-len</fieldref>
</list>
- <list type="char" name="authorization_protocol_data">
- <fieldref>authorization_protocol_data_len</fieldref>
+ <list type="char" name="authorization-protocol-data">
+ <fieldref>authorization-protocol-data-len</fieldref>
</list>
</struct>
<struct name="ConnSetupGenericRep">
@@ -157,42 +157,42 @@ authorization from the authors.
<struct name="ConnSetupFailedRep">
<!-- always 0 -> Failed -->
<field type="CARD8" name="status"/>
- <field type="CARD8" name="reason_len"/>
- <field type="VERSION" name="protocol_version"/>
+ <field type="CARD8" name="reason-len"/>
+ <field type="VERSION" name="protocol-version"/>
<field type="CARD16" name="length"/>
<list type="char" name="reason">
- <fieldref>reason_len</fieldref>
+ <fieldref>reason-len</fieldref>
</list>
</struct>
<struct name="ConnSetupSuccessRep">
<!-- always 1 -> Success -->
<field type="CARD8" name="status"/>
<pad bytes="1"/>
- <field type="VERSION" name="protocol_version"/>
+ <field type="VERSION" name="protocol-version"/>
<field type="CARD16" name="length"/>
- <field type="CARD32" name="release_number"/>
- <field type="CARD32" name="resource_id_base"/>
- <field type="CARD32" name="resource_id_mask"/>
- <field type="CARD32" name="motion_buffer_size"/>
- <field type="CARD16" name="vendor_len"/>
- <field type="CARD16" name="maximum_request_length"/>
- <field type="CARD8" name="roots_len"/>
- <field type="CARD8" name="pixmap_formats_len"/>
- <field type="CARD8" name="image_byte_order"/>
- <field type="CARD8" name="bitmap_format_bit_order"/>
- <field type="CARD8" name="bitmap_format_scanline_unit"/>
- <field type="CARD8" name="bitmap_format_scanline_pad"/>
- <field type="KEYCODE" name="min_keycode"/>
- <field type="KEYCODE" name="max_keycode"/>
+ <field type="CARD32" name="release-number"/>
+ <field type="CARD32" name="resource-id-base"/>
+ <field type="CARD32" name="resource-id-mask"/>
+ <field type="CARD32" name="motion-buffer-size"/>
+ <field type="CARD16" name="vendor-len"/>
+ <field type="CARD16" name="maximum-request-length"/>
+ <field type="CARD8" name="roots-len"/>
+ <field type="CARD8" name="pixmap-formats-len"/>
+ <field type="CARD8" name="image-byte-order"/>
+ <field type="CARD8" name="bitmap-format-bit-order"/>
+ <field type="CARD8" name="bitmap-format-scanline-unit"/>
+ <field type="CARD8" name="bitmap-format-scanline-pad"/>
+ <field type="KEYCODE" name="min-keycode"/>
+ <field type="KEYCODE" name="max-keycode"/>
<pad bytes="4"/>
<list type="char" name="vendor">
- <fieldref>vendor_len</fieldref>
+ <fieldref>vendor-len</fieldref>
</list>
- <list type="FORMAT" name="pixmap_formats">
- <fieldref>pixmap_formats_len</fieldref>
+ <list type="FORMAT" name="pixmap-formats">
+ <fieldref>pixmap-formats-len</fieldref>
</list>
<list type="SCREEN" name="roots">
- <fieldref>roots_len</fieldref>
+ <fieldref>roots-len</fieldref>
</list>
</struct>
<struct name="ConnSetupAuthenticateRep">
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 44ad01c..a69975e 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -33,12 +33,12 @@ 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="INT16" name="root-x"/>
+ <field type="INT16" name="root-y"/>
+ <field type="INT16" name="event-x"/>
+ <field type="INT16" name="event-y"/>
<field type="CARD16" name="state"/>
- <field type="BOOL" name="same_screen"/>
+ <field type="BOOL" name="same-screen"/>
</event>
<eventcopy name="KeyRelease" number="3" ref="KeyPress"/>
<event name="ButtonPress" number="4">
@@ -47,12 +47,12 @@ 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="INT16" name="root-x"/>
+ <field type="INT16" name="root-y"/>
+ <field type="INT16" name="event-x"/>
+ <field type="INT16" name="event-y"/>
<field type="CARD16" name="state"/>
- <field type="BOOL" name="same_screen"/>
+ <field type="BOOL" name="same-screen"/>
</event>
<eventcopy name="ButtonRelease" number="5" ref="ButtonPress"/>
<event name="MotionNotify" number="6">
@@ -61,12 +61,12 @@ 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="INT16" name="root-x"/>
+ <field type="INT16" name="root-y"/>
+ <field type="INT16" name="event-x"/>
+ <field type="INT16" name="event-y"/>
<field type="CARD16" name="state"/>
- <field type="BOOL" name="same_screen"/>
+ <field type="BOOL" name="same-screen"/>
</event>
<event name="EnterNotify" number="7">
<field type="BYTE" name="detail"/>
@@ -74,13 +74,13 @@ 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="INT16" name="root-x"/>
+ <field type="INT16" name="root-y"/>
+ <field type="INT16" name="event-x"/>
+ <field type="INT16" name="event-y"/>
<field type="CARD16" name="state"/>
<field type="BYTE" name="mode"/>
- <field type="BYTE" name="same_screen_focus"/>
+ <field type="BYTE" name="same-screen-focus"/>
</event>
<eventcopy name="LeaveNotify" number="8" ref="EnterNotify"/>
<event name="FocusIn" number="9">
@@ -106,15 +106,15 @@ authorization from the authors.
<field type="DRAWABLE" name="drawable"/>
<!-- FIXME: type change -->
<field type="RECTANGLE"/>
- <field type="CARD16" name="minor_opcode"/>
+ <field type="CARD16" name="minor-opcode"/>
<field type="CARD16" name="count"/>
- <field type="CARD8" name="major_opcode"/>
+ <field type="CARD8" name="major-opcode"/>
</event>
<event name="NoExposure" number="14">
<pad bytes="1"/>
<field type="DRAWABLE" name="drawable"/>
- <field type="CARD16" name="minor_opcode"/>
- <field type="CARD8" name="major_opcode"/>
+ <field type="CARD16" name="minor-opcode"/>
+ <field type="CARD8" name="major-opcode"/>
</event>
<event name="VisibilityNotify" number="15">
<pad bytes="1"/>
@@ -126,8 +126,8 @@ authorization from the authors.
<field type="WINDOW" name="parent"/>
<field type="WINDOW" name="window"/>
<field type="RECTANGLE"/>
- <field type="CARD16" name="border_width"/>
- <field type="BOOL" name="override_redirect"/>
+ <field type="CARD16" name="border-width"/>
+ <field type="BOOL" name="override-redirect"/>
</event>
<event name="DestroyNotify" number="17">
<pad bytes="1"/>
@@ -138,13 +138,13 @@ authorization from the authors.
<pad bytes="1"/>
<field type="WINDOW" name="event"/>
<field type="WINDOW" name="window"/>
- <field type="BOOL" name="from_configure"/>
+ <field type="BOOL" name="from-configure"/>
</event>
<event name="MapNotify" number="19">
<pad bytes="1"/>
<field type="WINDOW" name="event"/>
<field type="WINDOW" name="window"/>
- <field type="BOOL" name="override_redirect"/>
+ <field type="BOOL" name="override-redirect"/>
</event>
<event name="MapRequest" number="20">
<pad bytes="1"/>
@@ -157,25 +157,25 @@ authorization from the authors.
<field type="WINDOW" name="window"/>
<field type="WINDOW" name="parent"/>
<field type="POINT"/>
- <field type="BOOL" name="override_redirect"/>
+ <field type="BOOL" name="override-redirect"/>
</event>
<event name="ConfigureNotify" number="22">
<pad bytes="1"/>
<field type="WINDOW" name="event"/>
<field type="WINDOW" name="window"/>
- <field type="WINDOW" name="above_sibling"/>
+ <field type="WINDOW" name="above-sibling"/>
<field type="RECTANGLE"/>
- <field type="CARD16" name="border_width"/>
- <field type="BOOL" name="override_redirect"/>
+ <field type="CARD16" name="border-width"/>
+ <field type="BOOL" name="override-redirect"/>
</event>
<event name="ConfigureRequest" number="23">
- <field type="BYTE" name="stack_mode"/>
+ <field type="BYTE" name="stack-mode"/>
<field type="WINDOW" name="parent"/>
<field type="WINDOW" name="window"/>
<field type="WINDOW" name="sibling"/>
<field type="RECTANGLE"/>
- <field type="CARD16" name="border_width"/>
- <field type="CARD16" name="value_mask"/>
+ <field type="CARD16" name="border-width"/>
+ <field type="CARD16" name="value-mask"/>
</event>
<event name="GravityNotify" number="24">
<pad bytes="1"/>
@@ -259,18 +259,18 @@ authorization from the authors.
<event name="MappingNotify" number="34">
<pad bytes="1"/>
<field type="BYTE" name="request"/>
- <field type="KEYCODE" name="first_keycode"/>
+ <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"/>
+ <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"/>
+ <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"/>
@@ -292,91 +292,91 @@ authorization from the authors.
<!-- FIXME: The ListFontsWithInfo request is not supported by XCB. -->
<!-- Window attributes for CreateWindow and ChangeWindowAttributes. -->
<enum name="CW">
- <item name="BackPixmap">
+ <item name="back-pixmap">
<op op="<<">
<value>1</value>
<value>0</value>
</op>
</item>
- <item name="BackPixel">
+ <item name="back-pixel">
<op op="<<">
<value>1</value>
<value>1</value>
</op>
</item>
- <item name="BorderPixmap">
+ <item name="border-pixmap">
<op op="<<">
<value>1</value>
<value>2</value>
</op>
</item>
- <item name="BorderPixel">
+ <item name="border-pixel">
<op op="<<">
<value>1</value>
<value>3</value>
</op>
</item>
- <item name="BitGravity">
+ <item name="bit-gravity">
<op op="<<">
<value>1</value>
<value>4</value>
</op>
</item>
- <item name="WinGravity">
+ <item name="win-gravity">
<op op="<<">
<value>1</value>
<value>5</value>
</op>
</item>
- <item name="BackingStore">
+ <item name="backing-store">
<op op="<<">
<value>1</value>
<value>6</value>
</op>
</item>
- <item name="BackingPlanes">
+ <item name="backing-planes">
<op op="<<">
<value>1</value>
<value>7</value>
</op>
</item>
- <item name="BackingPixel">
+ <item name="backing-pixel">
<op op="<<">
<value>1</value>
<value>8</value>
</op>
</item>
- <item name="OverrideRedirect">
+ <item name="override-redirect">
<op op="<<">
<value>1</value>
<value>9</value>
</op>
</item>
- <item name="SaveUnder">
+ <item name="save-under">
<op op="<<">
<value>1</value>
<value>10</value>
</op>
</item>
- <item name="EventMask">
+ <item name="event-mask">
<op op="<<">
<value>1</value>
<value>11</value>
</op>
</item>
- <item name="DontPropagate">
+ <item name="dont-propagate">
<op op="<<">
<value>1</value>
<value>12</value>
</op>
</item>
- <item name="Colormap">
+ <item name="colormap">
<op op="<<">
<value>1</value>
<value>13</value>
</op>
</item>
- <item name="Cursor">
+ <item name="cursor">
<op op="<<">
<value>1</value>
<value>14</value>
@@ -388,32 +388,32 @@ authorization from the authors.
<field type="WINDOW" name="wid"/>
<field type="WINDOW" name="parent"/>
<field type="RECTANGLE"/>
- <field type="CARD16" name="border_width"/>
+ <field type="CARD16" name="border-width"/>
<field type="CARD16" name="class"/>
<field type="VISUALID" name="visual"/>
- <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="ChangeWindowAttributes" opcode="2">
<pad bytes="1"/>
<field type="WINDOW" name="window"/>
- <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<struct name="WindowAttributes">
- <field type="CARD8" name="backing_store"/>
+ <field type="CARD8" name="backing-store"/>
<field type="VISUALID" name="visual"/>
<field type="CARD16" name="class"/>
- <field type="CARD8" name="bit_gravity"/>
- <field type="CARD8" name="win_gravity"/>
- <field type="CARD32" name="backing_planes"/>
- <field type="CARD32" name="backing_pixel"/>
- <field type="BOOL" name="save_under"/>
- <field type="BOOL" name="map_is_installed"/>
- <field type="CARD8" name="map_state"/>
- <field type="BOOL" name="override_redirect"/>
+ <field type="CARD8" name="bit-gravity"/>
+ <field type="CARD8" name="win-gravity"/>
+ <field type="CARD32" name="backing-planes"/>
+ <field type="CARD32" name="backing-pixel"/>
+ <field type="BOOL" name="save-under"/>
+ <field type="BOOL" name="map-is-installed"/>
+ <field type="CARD8" name="map-state"/>
+ <field type="BOOL" name="override-redirect"/>
<field type="COLORMAP" name="colormap"/>
- <field type="CARD32" name="all_event_masks"/>
- <field type="CARD32" name="your_event_mask"/>
- <field type="CARD16" name="do_not_propagate_mask"/>
+ <field type="CARD32" name="all-event-masks"/>
+ <field type="CARD32" name="your-event-mask"/>
+ <field type="CARD16" name="do-not-propagate-mask"/>
</struct>
<request name="GetWindowAttributes" opcode="3">
<pad bytes="1"/>
@@ -459,7 +459,7 @@ authorization from the authors.
<request name="ConfigureWindow" opcode="12">
<pad bytes="1"/>
<field type="WINDOW" name="window"/>
- <valueparam value-mask-type="CARD16" value-mask-name="value_mask" value-list-name="value_list"/>
+ <valueparam value-mask-type="CARD16" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="CirculateWindow" opcode="13">
<field type="CARD8" name="direction"/>
@@ -469,7 +469,7 @@ authorization from the authors.
<field type="CARD8" name="depth"/>
<field type="WINDOW" name="root"/>
<field type="RECTANGLE"/>
- <field type="CARD16" name="border_width"/>
+ <field type="CARD16" name="border-width"/>
</struct>
<request name="GetGeometry" opcode="14">
<pad bytes="1"/>
@@ -485,19 +485,19 @@ authorization from the authors.
<pad bytes="1"/>
<field type="WINDOW" name="root"/>
<field type="WINDOW" name="parent"/>
- <field type="CARD16" name="children_len"/>
+ <field type="CARD16" name="children-len"/>
<pad bytes="14"/>
<list type="WINDOW" name="children">
- <fieldref>children_len</fieldref>
+ <fieldref>children-len</fieldref>
</list>
</reply>
</request>
<request name="InternAtom" opcode="16">
- <field type="BOOL" name="only_if_exists"/>
- <field type="CARD16" name="name_len"/>
+ <field type="BOOL" name="only-if-exists"/>
+ <field type="CARD16" name="name-len"/>
<pad bytes="2"/>
<list type="char" name="name">
- <fieldref>name_len</fieldref>
+ <fieldref>name-len</fieldref>
</list>
<reply>
<pad bytes="1"/>
@@ -509,10 +509,10 @@ authorization from the authors.
<field type="ATOM" name="atom"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="name_len"/>
+ <field type="CARD16" name="name-len"/>
<pad bytes="22"/>
<list type="CARD8" name="name">
- <fieldref>name_len</fieldref>
+ <fieldref>name-len</fieldref>
</list>
</reply>
</request>
@@ -523,11 +523,11 @@ authorization from the authors.
<field type="ATOM" name="type"/>
<field type="CARD8" name="format"/>
<pad bytes="3"/>
- <field type="CARD32" name="data_len"/>
+ <field type="CARD32" name="data-len"/>
<list type="void" name="data">
<op op="/">
<op op="*">
- <fieldref>data_len</fieldref>
+ <fieldref>data-len</fieldref>
<fieldref>format</fieldref>
</op>
<value>8</value>
@@ -544,16 +544,16 @@ authorization from the authors.
<field type="WINDOW" name="window"/>
<field type="ATOM" name="property"/>
<field type="ATOM" name="type"/>
- <field type="CARD32" name="long_offset"/>
- <field type="CARD32" name="long_length"/>
+ <field type="CARD32" name="long-offset"/>
+ <field type="CARD32" name="long-length"/>
<reply>
<field type="CARD8" name="format"/>
<field type="ATOM" name="type"/>
- <field type="CARD32" name="bytes_after"/>
- <field type="CARD32" name="value_len"/>
+ <field type="CARD32" name="bytes-after"/>
+ <field type="CARD32" name="value-len"/>
<pad bytes="12"/>
<list type="void" name="value">
- <fieldref>value_len</fieldref>
+ <fieldref>value-len</fieldref>
</list>
</reply>
</request>
@@ -562,10 +562,10 @@ authorization from the authors.
<field type="WINDOW" name="window"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="atoms_len"/>
+ <field type="CARD16" name="atoms-len"/>
<pad bytes="22"/>
<list type="ATOM" name="atoms">
- <fieldref>atoms_len</fieldref>
+ <fieldref>atoms-len</fieldref>
</list>
</reply>
</request>
@@ -594,18 +594,18 @@ authorization from the authors.
<request name="SendEvent" opcode="25">
<field type="BOOL" name="propagate"/>
<field type="WINDOW" name="destination"/>
- <field type="CARD32" name="event_mask"/>
+ <field type="CARD32" name="event-mask"/>
<list type="char" name="event">
<value>32</value>
</list>
</request>
<request name="GrabPointer" opcode="26">
- <field type="BOOL" name="owner_events"/>
- <field type="WINDOW" name="grab_window"/>
- <field type="CARD16" name="event_mask"/>
- <field type="BYTE" name="pointer_mode"/>
- <field type="BYTE" name="keyboard_mode"/>
- <field type="WINDOW" name="confine_to"/>
+ <field type="BOOL" name="owner-events"/>
+ <field type="WINDOW" name="grab-window"/>
+ <field type="CARD16" name="event-mask"/>
+ <field type="BYTE" name="pointer-mode"/>
+ <field type="BYTE" name="keyboard-mode"/>
+ <field type="WINDOW" name="confine-to"/>
<field type="CURSOR" name="cursor"/>
<field type="TIMESTAMP" name="time"/>
<reply>
@@ -617,12 +617,12 @@ authorization from the authors.
<field type="TIMESTAMP" name="time"/>
</request>
<request name="GrabButton" opcode="28">
- <field type="BOOL" name="owner_events"/>
- <field type="WINDOW" name="grab_window"/>
- <field type="CARD16" name="event_mask"/>
- <field type="CARD8" name="pointer_mode"/>
- <field type="CARD8" name="keyboard_mode"/>
- <field type="WINDOW" name="confine_to"/>
+ <field type="BOOL" name="owner-events"/>
+ <field type="WINDOW" name="grab-window"/>
+ <field type="CARD16" name="event-mask"/>
+ <field type="CARD8" name="pointer-mode"/>
+ <field type="CARD8" name="keyboard-mode"/>
+ <field type="WINDOW" name="confine-to"/>
<field type="CURSOR" name="cursor"/>
<field type="CARD8" name="button"/>
<pad bytes="1"/>
@@ -630,7 +630,7 @@ authorization from the authors.
</request>
<request name="UngrabButton" opcode="29">
<field type="CARD8" name="button"/>
- <field type="WINDOW" name="grab_window"/>
+ <field type="WINDOW" name="grab-window"/>
<field type="CARD16" name="modifiers"/>
<pad bytes="2"/>
</request>
@@ -638,14 +638,14 @@ authorization from the authors.
<pad bytes="1"/>
<field type="CURSOR" name="cursor"/>
<field type="TIMESTAMP" name="time"/>
- <field type="CARD16" name="event_mask"/>
+ <field type="CARD16" name="event-mask"/>
</request>
<request name="GrabKeyboard" opcode="31">
- <field type="BOOL" name="owner_events"/>
- <field type="WINDOW" name="grab_window"/>
+ <field type="BOOL" name="owner-events"/>
+ <field type="WINDOW" name="grab-window"/>
<field type="TIMESTAMP" name="time"/>
- <field type="BYTE" name="pointer_mode"/>
- <field type="BYTE" name="keyboard_mode"/>
+ <field type="BYTE" name="pointer-mode"/>
+ <field type="BYTE" name="keyboard-mode"/>
<reply>
<field type="BYTE" name="status"/>
</reply>
@@ -655,16 +655,16 @@ authorization from the authors.
<field type="TIMESTAMP" name="time"/>
</request>
<request name="GrabKey" opcode="33">
- <field type="BOOL" name="owner_events"/>
- <field type="WINDOW" name="grab_window"/>
+ <field type="BOOL" name="owner-events"/>
+ <field type="WINDOW" name="grab-window"/>
<field type="CARD16" name="modifiers"/>
<field type="KEYCODE" name="key"/>
- <field type="CARD8" name="pointer_mode"/>
- <field type="CARD8" name="keyboard_mode"/>
+ <field type="CARD8" name="pointer-mode"/>
+ <field type="CARD8" name="keyboard-mode"/>
</request>
<request name="UngrabKey" opcode="34">
<field type="CARD8" name="key"/>
- <field type="WINDOW" name="grab_window"/>
+ <field type="WINDOW" name="grab-window"/>
<field type="CARD16" name="modifiers"/>
</request>
<request name="AllowEvents" opcode="35">
@@ -677,13 +677,13 @@ authorization from the authors.
<pad bytes="1"/>
<field type="WINDOW" name="window"/>
<reply>
- <field type="BOOL" name="same_screen"/>
+ <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="INT16" name="root-x"/>
+ <field type="INT16" name="root-y"/>
+ <field type="INT16" name="win-x"/>
+ <field type="INT16" name="win-y"/>
<field type="CARD16" name="mask"/>
</reply>
</request>
@@ -698,45 +698,45 @@ authorization from the authors.
<field type="TIMESTAMP" name="stop"/>
<reply>
<pad bytes="1"/>
- <field type="CARD32" name="events_len"/>
+ <field type="CARD32" name="events-len"/>
<pad bytes="20"/>
<list type="TIMECOORD" name="events">
- <fieldref>events_len</fieldref>
+ <fieldref>events-len</fieldref>
</list>
</reply>
</request>
<request name="TranslateCoordinates" opcode="40">
<pad bytes="1"/>
- <field type="WINDOW" name="src_window"/>
- <field type="WINDOW" name="dst_window"/>
- <field type="INT16" name="src_x"/>
- <field type="INT16" name="src_y"/>
+ <field type="WINDOW" name="src-window"/>
+ <field type="WINDOW" name="dst-window"/>
+ <field type="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
<reply>
- <field type="BOOL" name="same_screen"/>
+ <field type="BOOL" name="same-screen"/>
<field type="WINDOW" name="child"/>
- <field type="CARD16" name="dst_x"/>
- <field type="CARD16" name="dst_y"/>
+ <field type="CARD16" name="dst-x"/>
+ <field type="CARD16" name="dst-y"/>
</reply>
</request>
<request name="WarpPointer" opcode="41">
<pad bytes="1"/>
- <field type="WINDOW" name="src_window"/>
- <field type="WINDOW" name="dst_window"/>
- <field type="INT16" name="src_x"/>
- <field type="INT16" name="src_y"/>
- <field type="CARD16" name="src_width"/>
- <field type="CARD16" name="src_height"/>
- <field type="INT16" name="dst_x"/>
- <field type="INT16" name="dst_y"/>
+ <field type="WINDOW" name="src-window"/>
+ <field type="WINDOW" name="dst-window"/>
+ <field type="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
+ <field type="CARD16" name="src-width"/>
+ <field type="CARD16" name="src-height"/>
+ <field type="INT16" name="dst-x"/>
+ <field type="INT16" name="dst-y"/>
</request>
<request name="SetInputFocus" opcode="42">
- <field type="CARD8" name="revert_to"/>
+ <field type="CARD8" name="revert-to"/>
<field type="WINDOW" name="focus"/>
<field type="TIMESTAMP" name="time"/>
</request>
<request name="GetInputFocus" opcode="43">
<reply>
- <field type="CARD8" name="revert_to"/>
+ <field type="CARD8" name="revert-to"/>
<field type="WINDOW" name="focus"/>
</reply>
</request>
@@ -751,9 +751,9 @@ authorization from the authors.
<request name="OpenFont" opcode="45">
<pad bytes="1"/>
<field type="FONT" name="fid"/>
- <field type="CARD16" name="name_len"/>
+ <field type="CARD16" name="name-len"/>
<list type="char" name="name">
- <fieldref>name_len</fieldref>
+ <fieldref>name-len</fieldref>
</list>
</request>
<request name="CloseFont" opcode="46">
@@ -765,9 +765,9 @@ authorization from the authors.
<field type="CARD32" name="value"/>
</struct>
<struct name="CHARINFO">
- <field type="INT16" name="left_side_bearing"/>
- <field type="INT16" name="right_side_bearing"/>
- <field type="INT16" name="character_width"/>
+ <field type="INT16" name="left-side-bearing"/>
+ <field type="INT16" name="right-side-bearing"/>
+ <field type="INT16" name="character-width"/>
<field type="INT16" name="ascent"/>
<field type="INT16" name="descent"/>
<field type="CARD16" name="attributes"/>
@@ -777,115 +777,115 @@ authorization from the authors.
<field type="FONTABLE" name="font"/>
<reply>
<pad bytes="1"/>
- <field type="CHARINFO" name="min_bounds"/>
+ <field type="CHARINFO" name="min-bounds"/>
<pad bytes="4"/>
- <field type="CHARINFO" name="max_bounds"/>
+ <field type="CHARINFO" name="max-bounds"/>
<pad bytes="4"/>
- <field type="CARD16" name="min_char_or_byte2"/>
- <field type="CARD16" name="max_char_or_byte2"/>
- <field type="CARD16" name="default_char"/>
- <field type="CARD16" name="properties_len"/>
- <field type="BYTE" name="draw_direction"/>
- <field type="CARD8" name="min_byte1"/>
- <field type="CARD8" name="max_byte1"/>
- <field type="BOOL" name="all_chars_exist"/>
- <field type="INT16" name="font_ascent"/>
- <field type="INT16" name="font_descent"/>
- <field type="CARD32" name="char_infos_len"/>
+ <field type="CARD16" name="min-char-or-byte2"/>
+ <field type="CARD16" name="max-char-or-byte2"/>
+ <field type="CARD16" name="default-char"/>
+ <field type="CARD16" name="properties-len"/>
+ <field type="BYTE" name="draw-direction"/>
+ <field type="CARD8" name="min-byte1"/>
+ <field type="CARD8" name="max-byte1"/>
+ <field type="BOOL" name="all-chars-exist"/>
+ <field type="INT16" name="font-ascent"/>
+ <field type="INT16" name="font-descent"/>
+ <field type="CARD32" name="char-infos-len"/>
<list type="FONTPROP" name="properties">
- <fieldref>properties_len</fieldref>
+ <fieldref>properties-len</fieldref>
</list>
- <list type="CHARINFO" name="char_infos">
- <fieldref>char_infos_len</fieldref>
+ <list type="CHARINFO" name="char-infos">
+ <fieldref>char-infos-len</fieldref>
</list>
</reply>
</request>
<request name="QueryTextExtents" opcode="48">
<exprfield type="BOOL" name="odd_length">
<op op="&">
- <fieldref>string_len</fieldref>
+ <fieldref>string-len</fieldref>
<value>1</value>
</op>
</exprfield>
<field type="FONTABLE" name="font"/>
<list type="CHAR2B" name="string"/>
<reply>
- <field type="BYTE" name="draw_direction"/>
- <field type="INT16" name="font_ascent"/>
- <field type="INT16" name="font_descent"/>
- <field type="INT16" name="overall_ascent"/>
- <field type="INT16" name="overall_descent"/>
- <field type="INT32" name="overall_width"/>
- <field type="INT32" name="overall_left"/>
- <field type="INT32" name="overall_right"/>
+ <field type="BYTE" name="draw-direction"/>
+ <field type="INT16" name="font-ascent"/>
+ <field type="INT16" name="font-descent"/>
+ <field type="INT16" name="overall-ascent"/>
+ <field type="INT16" name="overall-descent"/>
+ <field type="INT32" name="overall-width"/>
+ <field type="INT32" name="overall-left"/>
+ <field type="INT32" name="overall-right"/>
</reply>
</request>
<struct name="STR">
- <field type="CARD8" name="name_len"/>
+ <field type="CARD8" name="name-len"/>
<list type="char" name="name">
- <fieldref>name_len</fieldref>
+ <fieldref>name-len</fieldref>
</list>
</struct>
<request name="ListFonts" opcode="49">
<pad bytes="1"/>
- <field type="CARD16" name="max_names"/>
- <field type="CARD16" name="pattern_len"/>
+ <field type="CARD16" name="max-names"/>
+ <field type="CARD16" name="pattern-len"/>
<list type="char" name="pattern">
- <fieldref>pattern_len</fieldref>
+ <fieldref>pattern-len</fieldref>
</list>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="names_len"/>
+ <field type="CARD16" name="names-len"/>
<pad bytes="22"/>
<list type="STR" name="names">
- <fieldref>names_len</fieldref>
+ <fieldref>names-len</fieldref>
</list>
</reply>
</request>
<request name="ListFontsWithInfo" opcode="50">
<pad bytes="1"/>
- <field type="CARD16" name="max_names"/>
- <field type="CARD16" name="pattern_len"/>
+ <field type="CARD16" name="max-names"/>
+ <field type="CARD16" name="pattern-len"/>
<list type="char" name="pattern">
- <fieldref>pattern_len</fieldref>
+ <fieldref>pattern-len</fieldref>
</list>
<reply>
- <field type="CARD8" name="name_len"/>
- <field type="CHARINFO" name="min_bounds"/>
+ <field type="CARD8" name="name-len"/>
+ <field type="CHARINFO" name="min-bounds"/>
<pad bytes="4"/>
- <field type="CHARINFO" name="max_bounds"/>
+ <field type="CHARINFO" name="max-bounds"/>
<pad bytes="4"/>
- <field type="CARD16" name="min_char_or_byte2"/>
- <field type="CARD16" name="max_char_or_byte2"/>
- <field type="CARD16" name="default_char"/>
- <field type="CARD16" name="properties_len"/>
- <field type="BYTE" name="draw_direction"/>
- <field type="CARD8" name="min_byte1"/>
- <field type="CARD8" name="max_byte1"/>
- <field type="BOOL" name="all_chars_exist"/>
- <field type="INT16" name="font_ascent"/>
- <field type="INT16" name="font_descent"/>
- <field type="CARD32" name="replies_hint"/>
+ <field type="CARD16" name="min-char-or-byte2"/>
+ <field type="CARD16" name="max-char-or-byte2"/>
+ <field type="CARD16" name="default-char"/>
+ <field type="CARD16" name="properties-len"/>
+ <field type="BYTE" name="draw-direction"/>
+ <field type="CARD8" name="min-byte1"/>
+ <field type="CARD8" name="max-byte1"/>
+ <field type="BOOL" name="all-chars-exist"/>
+ <field type="INT16" name="font-ascent"/>
+ <field type="INT16" name="font-descent"/>
+ <field type="CARD32" name="replies-hint"/>
<list type="FONTPROP" name="properties">
- <fieldref>properties_len</fieldref>
+ <fieldref>properties-len</fieldref>
</list>
<list type="char" name="name">
- <fieldref>name_len</fieldref>
+ <fieldref>name-len</fieldref>
</list>
</reply>
</request>
<request name="SetFontPath" opcode="51">
<pad bytes="1"/>
- <field type="CARD16" name="font_qty"/>
+ <field type="CARD16" name="font-qty"/>
<list type="char" name="path"/>
</request>
<request name="GetFontPath" opcode="52">
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="path_len"/>
+ <field type="CARD16" name="path-len"/>
<pad bytes="22"/>
<list type="STR" name="path">
- <fieldref>path_len</fieldref>
+ <fieldref>path-len</fieldref>
</list>
</reply>
</request>
@@ -903,32 +903,32 @@ authorization from the authors.
<pad bytes="1"/>
<field type="GCONTEXT" name="cid"/>
<field type="DRAWABLE" name="drawable"/>
- <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="ChangeGC" opcode="56">
<pad bytes="1"/>
<field type="GCONTEXT" name="gc"/>
- <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="CopyGC" opcode="57">
<pad bytes="1"/>
- <field type="GCONTEXT" name="src_gc"/>
- <field type="GCONTEXT" name="dst_gc"/>
- <field type="CARD32" name="value_mask"/>
+ <field type="GCONTEXT" name="src-gc"/>
+ <field type="GCONTEXT" name="dst-gc"/>
+ <field type="CARD32" name="value-mask"/>
</request>
<request name="SetDashes" opcode="58">
<pad bytes="1"/>
<field type="GCONTEXT" name="gc"/>
- <field type="CARD16" name="dash_offset"/>
- <field type="CARD16" name="dashes_len"/>
+ <field type="CARD16" name="dash-offset"/>
+ <field type="CARD16" name="dashes-len"/>
<list type="CARD8" name="dashes">
- <fieldref>dashes_len</fieldref>
+ <fieldref>dashes-len</fieldref>
</list>
</request>
<request name="SetClipRectangles" opcode="59">
<field type="BYTE" name="ordering"/>
<field type="GCONTEXT" name="gc"/>
- <field type="POINT" name="clip_origin"/>
+ <field type="POINT" name="clip-origin"/>
<list type="RECTANGLE" name="rectangles"/>
</request>
<request name="FreeGC" opcode="60">
@@ -942,35 +942,35 @@ authorization from the authors.
</request>
<request name="CopyArea" opcode="62">
<pad bytes="1"/>
- <field type="DRAWABLE" name="src_drawable"/>
- <field type="DRAWABLE" name="dst_drawable"/>
+ <field type="DRAWABLE" name="src-drawable"/>
+ <field type="DRAWABLE" name="dst-drawable"/>
<field type="GCONTEXT" name="gc"/>
- <field type="INT16" name="src_x"/>
- <field type="INT16" name="src_y"/>
- <field type="INT16" name="dst_x"/>
- <field type="INT16" name="dst_y"/>
+ <field type="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
+ <field type="INT16" name="dst-x"/>
+ <field type="INT16" name="dst-y"/>
<field type="SIZE"/>
</request>
<request name="CopyPlane" opcode="63">
<pad bytes="1"/>
- <field type="DRAWABLE" name="src_drawable"/>
- <field type="DRAWABLE" name="dst_drawable"/>
+ <field type="DRAWABLE" name="src-drawable"/>
+ <field type="DRAWABLE" name="dst-drawable"/>
<field type="GCONTEXT" name="gc"/>
- <field type="INT16" name="src_x"/>
- <field type="INT16" name="src_y"/>
- <field type="INT16" name="dst_x"/>
- <field type="INT16" name="dst_y"/>
+ <field type="INT16" name="src-x"/>
+ <field type="INT16" name="src-y"/>
+ <field type="INT16" name="dst-x"/>
+ <field type="INT16" name="dst-y"/>
<field type="SIZE"/>
- <field type="CARD32" name="bit_plane"/>
+ <field type="CARD32" name="bit-plane"/>
</request>
<request name="PolyPoint" opcode="64" combine-adjacent="true">
- <field type="BYTE" name="coordinate_mode"/>
+ <field type="BYTE" name="coordinate-mode"/>
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
<list type="POINT" name="points"/>
</request>
<request name="PolyLine" opcode="65" combine-adjacent="true">
- <field type="BYTE" name="coordinate_mode"/>
+ <field type="BYTE" name="coordinate-mode"/>
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
<list type="POINT" name="points"/>
@@ -1009,7 +1009,7 @@ authorization from the authors.
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
<field type="CARD8" name="shape"/>
- <field type="CARD8" name="coordinate_mode"/>
+ <field type="CARD8" name="coordinate-mode"/>
<list type="POINT" name="points"/>
</request>
<request name="PolyFillRectangle" opcode="70" combine-adjacent="true">
@@ -1029,9 +1029,9 @@ authorization from the authors.
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
<field type="SIZE"/>
- <field type="INT16" name="dst_x"/>
- <field type="INT16" name="dst_y"/>
- <field type="CARD8" name="left_pad"/>
+ <field type="INT16" name="dst-x"/>
+ <field type="INT16" name="dst-y"/>
+ <field type="CARD8" name="left-pad"/>
<field type="CARD8" name="depth"/>
<list type="BYTE" name="data"/>
</request>
@@ -1040,7 +1040,7 @@ authorization from the authors.
<field type="CARD8" name="format"/>
<field type="DRAWABLE" name="drawable"/>
<field type="RECTANGLE"/>
- <field type="CARD32" name="plane_mask"/>
+ <field type="CARD32" name="plane-mask"/>
<reply>
<field type="CARD8" name="depth"/>
<field type="VISUALID" name="visual"/>
@@ -1068,21 +1068,21 @@ authorization from the authors.
<list type="BYTE" name="items"/>
</request>
<request name="ImageText8" opcode="76">
- <field type="BYTE" name="string_len"/>
+ <field type="BYTE" name="string-len"/>
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
<field type="POINT"/>
<list type="char" name="string">
- <fieldref>string_len</fieldref>
+ <fieldref>string-len</fieldref>
</list>
</request>
<request name="ImageText16" opcode="77">
- <field type="BYTE" name="string_len"/>
+ <field type="BYTE" name="string-len"/>
<field type="DRAWABLE" name="drawable"/>
<field type="GCONTEXT" name="gc"/>
<field type="POINT"/>
<list type="CHAR2B" name="string">
- <fieldref>string_len</fieldref>
+ <fieldref>string-len</fieldref>
</list>
</request>
<request name="CreateColormap" opcode="78">
@@ -1098,7 +1098,7 @@ authorization from the authors.
<request name="CopyColormapAndFree" opcode="80">
<pad bytes="1"/>
<field type="COLORMAP" name="mid"/>
- <field type="COLORMAP" name="src_cmap"/>
+ <field type="COLORMAP" name="src-cmap"/>
</request>
<request name="InstallColormap" opcode="81">
<pad bytes="1"/>
@@ -1113,10 +1113,10 @@ authorization from the authors.
<field type="WINDOW" name="window"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="cmaps_len"/>
+ <field type="CARD16" name="cmaps-len"/>
<pad bytes="22"/>
<list type="COLORMAP" name="cmaps">
- <fieldref>cmaps_len</fieldref>
+ <fieldref>cmaps-len</fieldref>
</list>
</reply>
</request>
@@ -1134,15 +1134,15 @@ authorization from the authors.
<request name="AllocNamedColor" opcode="85">
<pad bytes="1"/>
<field type="COLORMAP" name="cmap"/>
- <field type="CARD16" name="name_len"/>
+ <field type="CARD16" name="name-len"/>
<list type="char" name="name">
- <fieldref>name_len</fieldref>
+ <fieldref>name-len</fieldref>
</list>
<reply>
<pad bytes="1"/>
<field type="CARD32" name="pixel"/>
- <field type="COLOR" name="exact_color"/>
- <field type="COLOR" name="visual_color"/>
+ <field type="COLOR" name="exact-color"/>
+ <field type="COLOR" name="visual-color"/>
</reply>
</request>
<request name="AllocColorCells" opcode="86">
@@ -1152,14 +1152,14 @@ authorization from the authors.
<field type="CARD16" name="planes"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="pixels_len"/>
- <field type="CARD16" name="masks_len"/>
+ <field type="CARD16" name="pixels-len"/>
+ <field type="CARD16" name="masks-len"/>
<pad bytes="20"/>
<list type="CARD32" name="pixels">
- <fieldref>pixels_len</fieldref>
+ <fieldref>pixels-len</fieldref>
</list>
<list type="CARD32" name="masks">
- <fieldref>masks_len</fieldref>
+ <fieldref>masks-len</fieldref>
</list>
</reply>
</request>
@@ -1172,21 +1172,21 @@ authorization from the authors.
<field type="CARD16" name="blues"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="pixels_len"/>
+ <field type="CARD16" name="pixels-len"/>
<pad bytes="2"/>
- <field type="CARD32" name="red_mask"/>
- <field type="CARD32" name="green_mask"/>
- <field type="CARD32" name="blue_mask"/>
+ <field type="CARD32" name="red-mask"/>
+ <field type="CARD32" name="green-mask"/>
+ <field type="CARD32" name="blue-mask"/>
<pad bytes="8"/>
<list type="CARD32" name="pixels">
- <fieldref>pixels_len</fieldref>
+ <fieldref>pixels-len</fieldref>
</list>
</reply>
</request>
<request name="FreeColors" opcode="88">
<pad bytes="1"/>
<field type="COLORMAP" name="cmap"/>
- <field type="CARD32" name="plane_mask"/>
+ <field type="CARD32" name="plane-mask"/>
<list type="CARD32" name="pixels"/>
</request>
<struct name="COLORITEM">
@@ -1204,9 +1204,9 @@ authorization from the authors.
<field type="CARD8" name="flags"/>
<field type="COLORMAP" name="cmap"/>
<field type="CARD32" name="pixel"/>
- <field type="CARD16" name="name_len"/>
+ <field type="CARD16" name="name-len"/>
<list type="char" name="name">
- <fieldref>name_len</fieldref>
+ <fieldref>name-len</fieldref>
</list>
</request>
<struct name="RGB">
@@ -1219,24 +1219,24 @@ authorization from the authors.
<list type="CARD32" name="pixels"/>
<reply>
<pad bytes="1"/>
- <field type="CARD16" name="colors_len"/>
+ <field type="CARD16" name="colors-len"/>
<pad bytes="22"/>
<list type="RGB" name="colors">
- <fieldref>colors_len</fieldref>
+ <fieldref>colors-len</fieldref>
</list>
</reply>
</request>
<request name="LookupColor" opcode="92">
<pad bytes="1"/>
<field type="COLORMAP" name="cmap"/>
- <field type="CARD16" name="name_len"/>
+ <field type="CARD16" name="name-len"/>
<list type="char" name="name">
- <fieldref>name_len</fieldref>
+ <fieldref>name-len</fieldref>
</list>
<reply>
<pad bytes="1"/>
- <field type="COLOR" name="exact_color"/>
- <field type="COLOR" name="visual_color"/>
+ <field type="COLOR" name="exact-color"/>
+ <field type="COLOR" name="visual-color"/>
</reply>
</request>
<request name="CreateCursor" opcode="93">
@@ -1244,19 +1244,19 @@ authorization from the authors.
<field type="CURSOR" name="cid"/>
<field type="PIXMAP" name="source"/>
<field type="PIXMAP" name="mask"/>
- <field type="COLOR" name="fore_color"/>
- <field type="COLOR" name="back_color"/>
+ <field type="COLOR" name="fore-color"/>
+ <field type="COLOR" name="back-color"/>
<field type="POINT"/>
</request>
<request name="CreateGlyphCursor" opcode="94">
<pad bytes="1"/>
<field type="CURSOR" name="cid"/>
- <field type="FONT" name="source_font"/>
- <field type="FONT" name="mask_font"/>
- <field type="CARD16" name="source_char"/>
- <field type="CARD16" name="mask_char"/>
- <field type="COLOR" name="fore_color"/>
- <field type="COLOR" name="back_color"/>
+ <field type="FONT" name="source-font"/>
+ <field type="FONT" name="mask-font"/>
+ <field type="CARD16" name="source-char"/>
+ <field type="CARD16" name="mask-char"/>
+ <field type="COLOR" name="fore-color"/>
+ <field type="COLOR" name="back-color"/>
</request>
<request name="FreeCursor" opcode="95">
<pad bytes="1"/>
@@ -1265,8 +1265,8 @@ authorization from the authors.
<request name="RecolorCursor" opcode="96">
<pad bytes="1"/>
<field type="CURSOR" name="cursor"/>
- <field type="COLOR" name="fore_color"/>
- <field type="COLOR" name="back_color"/>
+ <field type="COLOR" name="fore-color"/>
+ <field type="COLOR" name="back-color"/>
</request>
<request name="QueryBestSize" opcode="97">
<field type="CARD8" name="class"/>
@@ -1279,44 +1279,44 @@ authorization from the authors.
</request>
<request name="QueryExtension" opcode="98">
<pad bytes="1"/>
- <field type="CARD16" name="name_len"/>
+ <field type="CARD16" name="name-len"/>
<list type="char" name="name">
- <fieldref>name_len</fieldref>
+ <fieldref>name-len</fieldref>
</list>
<reply>
<pad bytes="1"/>
<field type="BOOL" name="present"/>
- <field type="CARD8" name="major_opcode"/>
- <field type="CARD8" name="first_event"/>
- <field type="CARD8" name="first_error"/>
+ <field type="CARD8" name="major-opcode"/>
+ <field type="CARD8" name="first-event"/>
+ <field type="CARD8" name="first-error"/>
</reply>
</request>
<request name="ListExtensions" opcode="99">
<reply>
- <field type="CARD8" name="names_len"/>
+ <field type="CARD8" name="names-len"/>
<pad bytes="24"/>
<list type="STR" name="names">
- <fieldref>names_len</fieldref>
+ <fieldref>names-len</fieldref>
</list>
</reply>
</request>
<request name="ChangeKeyboardMapping" opcode="100">
- <field type="CARD8" name="keycode_count"/>
- <field type="KEYCODE" name="first_keycode"/>
- <field type="CARD8" name="keysyms_per_keycode"/>
+ <field type="CARD8" name="keycode-count"/>
+ <field type="KEYCODE" name="first-keycode"/>
+ <field type="CARD8" name="keysyms-per-keycode"/>
<list type="KEYSYM" name="keysyms">
<op op="*">
- <fieldref>keycode_count</fieldref>
- <fieldref>keysyms_per_keycode</fieldref>
+ <fieldref>keycode-count</fieldref>
+ <fieldref>keysyms-per-keycode</fieldref>
</op>
</list>
</request>
<request name="GetKeyboardMapping" opcode="101">
<pad bytes="1"/>
- <field type="KEYCODE" name="first_keycode"/>
+ <field type="KEYCODE" name="first-keycode"/>
<field type="CARD8" name="count"/>
<reply>
- <field type="BYTE" name="keysyms_per_keycode"/>
+ <field type="BYTE" name="keysyms-per-keycode"/>
<pad bytes="24"/>
<list type="KEYSYM" name="keysyms">
<op op="*">
@@ -1328,18 +1328,18 @@ authorization from the authors.
</request>
<request name="ChangeKeyboardControl" opcode="102">
<pad bytes="1"/>
- <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value-mask" value-list-name="value-list"/>
</request>
<request name="GetKeyboardControl" opcode="103">
<reply>
- <field type="BYTE" name="global_auto_repeat"/>
- <field type="CARD32" name="led_mask"/>
- <field type="CARD8" name="key_click_percent"/>
- <field type="CARD8" name="bell_percent"/>
- <field type="CARD16" name="bell_pitch"/>
- <field type="CARD16" name="bell_duration"/>
+ <field type="BYTE" name="global-auto-repeat"/>
+ <field type="CARD32" name="led-mask"/>
+ <field type="CARD8" name="key-click-percent"/>
+ <field type="CARD8" name="bell-percent"/>
+ <field type="CARD16" name="bell-pitch"/>
+ <field type="CARD16" name="bell-duration"/>
<pad bytes="2"/>
- <list type="CARD8" name="auto_repeats">
+ <list type="CARD8" name="auto-repeats">
<value>32</value>
</list>
</reply>
@@ -1348,15 +1348,15 @@ authorization from the authors.
<field type="INT8" name="percent"/>
</request>
<struct name="PointerControl">
- <field type="CARD16" name="acceleration_numerator"/>
- <field type="CARD16" name="acceleration_denominator"/>
+ <field type="CARD16" name="acceleration-numerator"/>
+ <field type="CARD16" name="acceleration-denominator"/>
<field type="CARD16" name="threshold"/>
</struct>
<request name="ChangePointerControl" opcode="105">
<pad bytes="1"/>
<field type="PointerControl" name="value"/>
- <field type="BOOL" name="do_acceleration"/>
- <field type="BOOL" name="do_threshold"/>
+ <field type="BOOL" name="do-acceleration"/>
+ <field type="BOOL" name="do-threshold"/>
</request>
<request name="GetPointerControl" opcode="106">
<reply>
@@ -1367,8 +1367,8 @@ authorization from the authors.
<struct name="ScreenSaver">
<field type="INT16" name="timeout"/>
<field type="INT16" name="interval"/>
- <field type="CARD8" name="prefer_blanking"/>
- <field type="CARD8" name="allow_exposures"/>
+ <field type="CARD8" name="prefer-blanking"/>
+ <field type="CARD8" name="allow-exposures"/>
</struct>
<request name="SetScreenSaver" opcode="107">
<pad bytes="1"/>
@@ -1383,9 +1383,9 @@ authorization from the authors.
<struct name="HOST">
<field type="CARD8" name="family"/>
<pad bytes="1"/>
- <field type="CARD16" name="address_len"/>
+ <field type="CARD16" name="address-len"/>
<list type="BYTE" name="address">
- <fieldref>address_len</fieldref>
+ <fieldref>address-len</fieldref>
</list>
</struct>
<request name="ChangeHosts" opcode="109">
@@ -1395,10 +1395,10 @@ authorization from the authors.
<request name="ListHosts" opcode="110">
<reply>
<field type="BYTE" name="mode"/>
- <field type="CARD16" name="hosts_len"/>
+ <field type="CARD16" name="hosts-len"/>
<pad bytes="22"/>
<list type="HOST" name="hosts">
- <fieldref>hosts_len</fieldref>
+ <fieldref>hosts-len</fieldref>
</list>
</reply>
</request>
@@ -1414,19 +1414,19 @@ authorization from the authors.
</request>
<request name="RotateProperties" opcode="114">
<field type="WINDOW" name="window"/>
- <field type="CARD16" name="atoms_len"/>
+ <field type="CARD16" name="atoms-len"/>
<field type="INT16" name="delta"/>
<list type="ATOM" name="atoms">
- <fieldref>atoms_len</fieldref>
+ <fieldref>atoms-len</fieldref>
</list>
</request>
<request name="ForceScreenSaver" opcode="115">
<field type="CARD8" name="mode"/>
</request>
<request name="SetPointerMapping" opcode="116">
- <field type="CARD8" name="map_len"/>
+ <field type="CARD8" name="map-len"/>
<list type="CARD8" name="map">
- <fieldref>map_len</fieldref>
+ <fieldref>map-len</fieldref>
</list>
<reply>
<field type="BYTE" name="status"/>
@@ -1434,18 +1434,18 @@ authorization from the authors.
</request>
<request name="GetPointerMapping" opcode="117">
<reply>
- <field type="CARD8" name="map_len"/>
+ <field type="CARD8" name="map-len"/>
<pad bytes="24"/>
<list type="CARD8" name="map">
- <fieldref>map_len</fieldref>
+ <fieldref>map-len</fieldref>
</list>
</reply>
</request>
<request name="SetModifierMapping" opcode="118">
- <field type="CARD8" name="keycodes_per_modifier"/>
+ <field type="CARD8" name="keycodes-per-modifier"/>
<list type="KEYCODE" name="keycodes">
<op op="*">
- <fieldref>keycodes_per_modifier</fieldref>
+ <fieldref>keycodes-per-modifier</fieldref>
<value>8</value>
</op>
</list>
@@ -1455,11 +1455,11 @@ authorization from the authors.
</request>
<request name="GetModifierMapping" opcode="119">
<reply>
- <field type="CARD8" name="keycodes_per_modifier"/>
+ <field type="CARD8" name="keycodes-per-modifier"/>
<pad bytes="24"/>
<list type="KEYCODE" name="keycodes">
<op op="*">
- <fieldref>keycodes_per_modifier</fieldref>
+ <fieldref>keycodes-per-modifier</fieldref>
<value>8</value>
</op>
</list>
diff-tree 33779ba105cf476685048c224e201fd901d6ca02 (from 5a8128e1c3a87d25623a74a91a7ee2129b643f91)
Author: Alp Toker <alp at atoker.com>
Date: Mon Mar 6 09:57:40 2006 +0000
Comment suffix-to-prefix corrections
Typo in SHAPE enum
diff --git a/xcb-proto/src/extensions/shape.xml b/xcb-proto/src/extensions/shape.xml
index 9d7c724..72a6be9 100644
--- a/xcb-proto/src/extensions/shape.xml
+++ b/xcb-proto/src/extensions/shape.xml
@@ -33,13 +33,15 @@ authorization from the authors.
<item name="Set"/>
<item name="Union"/>
<item name="Intersect"/>
- <item name="Substract"/>
+ <item name="Subtract"/>
<item name="Invert"/>
</enum>
<!-- Shape attributes of type SHAPE_KIND. -->
<enum name="SK">
<item name="Bounding"/>
<item name="Clip"/>
+<!-- TODO: xspec: 'Input' borrowed from xlib headers, validate -->
+ <item name="Input"/>
</enum>
<event name="Notify" number="0">
<field type="SHAPE_KIND" name="shape_kind"/>
@@ -101,14 +103,9 @@ authorization from the authors.
<field type="BOOL" name="bounding_shaped"/>
<field type="BOOL" name="clip_shaped"/>
<pad bytes="2"/>
- <field type="INT16" name="bounding_shape_extents_x"/>
- <field type="INT16" name="bounding_shape_extents_y"/>
- <field type="CARD16" name="bounding_shape_extents_width"/>
- <field type="CARD16" name="bounding_shape_extents_height"/>
- <field type="INT16" name="clip_shape_extents_x"/>
- <field type="INT16" name="clip_shape_extents_y"/>
- <field type="CARD16" name="clip_shape_extents_width"/>
- <field type="CARD16" name="clip_shape_extents_height"/>
+<!-- FIXME: xspec: validate unrolling -->
+ <field type="RECTANGLE" name="bounding_shape_extents"/>
+ <field type="RECTANGLE" name="clip_shape_extents"/>
</reply>
</request>
<request name="SelectInput" opcode="6">
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index e5d1354..3a0bf1b 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -125,8 +125,8 @@ authorization from the authors.
</event>
<request name="SelectCursorInput" opcode="3">
<field type="WINDOW" name="window"/>
- <field type="CARD32" name="event_mask"/>
<!-- CursorNotifyMask -->
+ <field type="CARD32" name="event_mask"/>
</request>
<request name="GetCursorImage" opcode="4">
<reply>
@@ -135,6 +135,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 -->
<list type="CARD32" name="cursor_image">
<op op="*">
<fieldref>width</fieldref>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 645ba97..44ad01c 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -236,22 +236,22 @@ authorization from the authors.
<union name="ClientMessageData">
<!-- The format member of the ClientMessage event determines which array
to use. -->
+<!-- 8 -->
<list type="CARD8" name="data8">
<value>20</value>
</list>
-<!-- 8 -->
+<!-- 16 -->
<list type="CARD16" name="data16">
<value>10</value>
</list>
-<!-- 16 -->
+<!-- 32 -->
<list type="CARD32" name="data32">
<value>5</value>
</list>
-<!-- 32 -->
</union>
<event name="ClientMessage" number="33">
- <field type="CARD8" name="format"/>
<!-- 8, 16, or 32. -->
+ <field type="CARD8" name="format"/>
<field type="WINDOW" name="window"/>
<field type="ATOM" name="type"/>
<field type="ClientMessageData" name="data"/>
diff-tree 5a8128e1c3a87d25623a74a91a7ee2129b643f91 (from 7201eb41b7aa64cd10acc74a007e06706baa4def)
Author: Alp Toker <alp at atoker.com>
Date: Mon Mar 6 08:58:37 2006 +0000
xmllint -format
Move XML comments from code-style (dependent on format) to prefix
diff --git a/xcb-proto/src/extensions/bigreq.xml b/xcb-proto/src/extensions/bigreq.xml
index 9e99d2e..bc3594e 100644
--- a/xcb-proto/src/extensions/bigreq.xml
+++ b/xcb-proto/src/extensions/bigreq.xml
@@ -25,12 +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">
+<xcb header="bigreq" extension-xname="BIG-REQUESTS" extension-name="BigRequests">
<request name="Enable" opcode="0">
<reply>
- <pad bytes="1" />
- <field type="CARD32" name="maximum_request_length" />
+ <pad bytes="1"/>
+ <field type="CARD32" name="maximum_request_length"/>
</reply>
</request>
</xcb>
diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index 2ff3f0d..53e7ef5 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -27,52 +27,44 @@ authorization from the authors.
<!-- This file describes version 0.2 of COMPOSITE. -->
<xcb header="composite" extension-xname="Composite" extension-name="Composite">
<import>xfixes</import>
-
<enum name="Redirect">
- <item name="Automatic" />
- <item name="Manual" />
+ <item name="Automatic"/>
+ <item name="Manual"/>
</enum>
-
<request name="QueryVersion" opcode="0">
- <field type="VERSION" name="client_version" />
+ <field type="VERSION" name="client_version"/>
<reply>
- <pad bytes="1" />
- <field type="VERSION" name="server_version" />
- <pad bytes="16" />
+ <pad bytes="1"/>
+ <field type="VERSION" name="server_version"/>
+ <pad bytes="16"/>
</reply>
</request>
-
<request name="RedirectWindow" opcode="1">
- <field type="WINDOW" name="window" />
- <field type="CARD8" name="update" />
- <pad bytes="3" />
+ <field type="WINDOW" name="window"/>
+ <field type="CARD8" name="update"/>
+ <pad bytes="3"/>
</request>
-
<request name="RedirectSubwindows" opcode="2">
- <field type="WINDOW" name="window" />
- <field type="CARD8" name="update" />
- <pad bytes="3" />
+ <field type="WINDOW" name="window"/>
+ <field type="CARD8" name="update"/>
+ <pad bytes="3"/>
</request>
-
<request name="UnredirectWindow" opcode="3">
- <field type="WINDOW" name="window" />
- <field type="CARD8" name="update" />
- <pad bytes="3" />
+ <field type="WINDOW" name="window"/>
+ <field type="CARD8" name="update"/>
+ <pad bytes="3"/>
</request>
-
<request name="UnredirectSubwindows" opcode="4">
- <field type="WINDOW" name="window" />
- <field type="CARD8" name="update" />
- <pad bytes="3" />
+ <field type="WINDOW" name="window"/>
+ <field type="CARD8" name="update"/>
+ <pad bytes="3"/>
</request>
-
<request name="CreateRegionFromBorderClip" opcode="5">
- <field type="REGION" name="region" />
- <field type="WINDOW" name="window" />
+ <field type="REGION" name="region"/>
+ <field type="WINDOW" name="window"/>
</request>
-
<request name="NameWindowPixmap" opcode="6">
- <field type="WINDOW" name="window" />
- <field type="PIXMAP" name="pixmap" />
+ <field type="WINDOW" name="window"/>
+ <field type="PIXMAP" name="pixmap"/>
</request>
</xcb>
diff --git a/xcb-proto/src/extensions/damage.xml b/xcb-proto/src/extensions/damage.xml
index cd79302..f3bc8a7 100644
--- a/xcb-proto/src/extensions/damage.xml
+++ b/xcb-proto/src/extensions/damage.xml
@@ -27,52 +27,46 @@ authorization from the authors.
<!-- This file describes version 1 of DAMAGE. -->
<xcb header="damage" extension-xname="DAMAGE" extension-name="Damage">
<import>xfixes</import>
-
- <xidtype name="DAMAGE" />
-
+ <xidtype name="DAMAGE"/>
<enum name="ReportLevel">
- <item name="RawRectangles" />
- <item name="DeltaRectangles" />
- <item name="BoundingBox" />
- <item name="NonEmpty" />
+ <item name="RawRectangles"/>
+ <item name="DeltaRectangles"/>
+ <item name="BoundingBox"/>
+ <item name="NonEmpty"/>
</enum>
-
- <error name="BadDamage" number="0" />
-
+ <error name="BadDamage" number="0"/>
<request name="QueryVersion" opcode="0">
- <field type="CARD32" name="client_major_version" />
- <field type="CARD32" name="client_minor_version" />
+ <field type="CARD32" name="client_major_version"/>
+ <field type="CARD32" name="client_minor_version"/>
<reply>
- <pad bytes="1" />
- <field type="CARD32" name="major_version" />
- <field type="CARD32" name="minor_version" />
- <pad bytes="16" />
+ <pad bytes="1"/>
+ <field type="CARD32" name="major_version"/>
+ <field type="CARD32" name="minor_version"/>
+ <pad bytes="16"/>
</reply>
</request>
-
<request name="Create" opcode="1">
- <field type="DAMAGE" name="damage" />
- <field type="DRAWABLE" name="drawable" />
- <field type="CARD8" name="level" /> <!-- ReportLevel -->
- <pad bytes="3" />
+ <field type="DAMAGE" name="damage"/>
+ <field type="DRAWABLE" name="drawable"/>
+<!-- ReportLevel -->
+ <field type="CARD8" name="level"/>
+ <pad bytes="3"/>
</request>
-
<request name="Destroy" opcode="2">
- <field type="DAMAGE" name="damage" />
+ <field type="DAMAGE" name="damage"/>
</request>
-
<request name="Subtract" opcode="3">
- <field type="DAMAGE" name="damage" />
- <field type="REGION" name="repair" />
- <field type="REGION" name="parts" />
+ <field type="DAMAGE" name="damage"/>
+ <field type="REGION" name="repair"/>
+ <field type="REGION" name="parts"/>
</request>
-
<event name="Notify" number="0">
- <field type="CARD8" name="level" /> <!-- ReportLevel -->
- <field type="DRAWABLE" name="drawable" />
- <field type="DAMAGE" name="damage" />
- <field type="TIMESTAMP" name="timestamp" />
- <field type="RECTANGLE" name="area" />
- <field type="RECTANGLE" name="geometry" />
+<!-- ReportLevel -->
+ <field type="CARD8" name="level"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="DAMAGE" name="damage"/>
+ <field type="TIMESTAMP" name="timestamp"/>
+ <field type="RECTANGLE" name="area"/>
+ <field type="RECTANGLE" name="geometry"/>
</event>
</xcb>
diff --git a/xcb-proto/src/extensions/dpms.xml b/xcb-proto/src/extensions/dpms.xml
index b6158ab..f61de27 100644
--- a/xcb-proto/src/extensions/dpms.xml
+++ b/xcb-proto/src/extensions/dpms.xml
@@ -27,48 +27,41 @@ authorization from the authors.
-->
<xcb header="dpms" extension-xname="DPMS" extension-name="DPMS">
<request name="GetVersion" opcode="0">
- <field type="VERSION" name="client_version" />
+ <field type="VERSION" name="client_version"/>
<reply>
- <pad bytes="1" />
- <field type="VERSION" name="server_version" />
+ <pad bytes="1"/>
+ <field type="VERSION" name="server_version"/>
</reply>
</request>
-
<request name="Capable" opcode="1">
<reply>
- <pad bytes="1" />
- <field type="BOOL" name="capable" />
+ <pad bytes="1"/>
+ <field type="BOOL" name="capable"/>
</reply>
</request>
-
<request name="GetTimeouts" opcode="2">
<reply>
- <pad bytes="1" />
- <field type="CARD16" name="standby_timeout" />
- <field type="CARD16" name="suspend_timeout" />
- <field type="CARD16" name="off_timeout" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="standby_timeout"/>
+ <field type="CARD16" name="suspend_timeout"/>
+ <field type="CARD16" name="off_timeout"/>
</reply>
</request>
-
<request name="SetTimeouts" opcode="3">
- <field type="CARD16" name="standby_timeout" />
- <field type="CARD16" name="suspend_timeout" />
- <field type="CARD16" name="off_timeout" />
- </request>
-
- <request name="Enable" opcode="4" />
-
- <request name="Disable" opcode="5" />
-
+ <field type="CARD16" name="standby_timeout"/>
+ <field type="CARD16" name="suspend_timeout"/>
+ <field type="CARD16" name="off_timeout"/>
+ </request>
+ <request name="Enable" opcode="4"/>
+ <request name="Disable" opcode="5"/>
<request name="ForceLevel" opcode="6">
- <field type="CARD16" name="power_level" />
+ <field type="CARD16" name="power_level"/>
</request>
-
<request name="Info" opcode="7">
<reply>
- <pad bytes="1" />
- <field type="CARD16" name="power_level" />
- <field type="BOOL" name="state" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="power_level"/>
+ <field type="BOOL" name="state"/>
</reply>
</request>
</xcb>
diff --git a/xcb-proto/src/extensions/glx.xml b/xcb-proto/src/extensions/glx.xml
index 0acab27..f17aab4 100644
--- a/xcb-proto/src/extensions/glx.xml
+++ b/xcb-proto/src/extensions/glx.xml
@@ -25,7 +25,6 @@ institutions shall not be used in advert
sale, use or other dealings in this Software without prior written
authorization from the authors.
-->
-
<!--
Note that on X.org servers before 6.9 (and probably others as well) the length
field in the reply is computed incorrectly for GetFBConfigs and
@@ -43,1413 +42,1308 @@ 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 -->
-
- <xidtype name="PIXMAP" />
- <xidtype name="CONTEXT" />
- <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 -->
- <field type="CARD32" name="bad_value" />
- <field type="CARD16" name="minor_opcode" />
- <field type="CARD8" name="major_opcode" />
- <pad bytes="21" />
- </error>
-
- <errorcopy name="BadContext" number="0" ref="Generic" />
- <errorcopy name="BadContextState" number="1" ref="Generic" />
- <errorcopy name="BadDrawable" number="2" ref="Generic" />
- <errorcopy name="BadPixmap" number="3" ref="Generic" />
- <errorcopy name="BadContextTag" number="4" ref="Generic" />
- <errorcopy name="BadCurrentWindow" number="5" ref="Generic" />
- <errorcopy name="BadRenderRequest" number="6" ref="Generic" />
- <errorcopy name="BadLargeRequest" number="7" ref="Generic" />
- <errorcopy name="UnsupportedPrivateRequest" number="8" ref="Generic" />
- <errorcopy name="BadFBConfig" number="9" ref="Generic" />
- <errorcopy name="BadPbuffer" number="10" ref="Generic" />
- <errorcopy name="BadCurrentDrawable" number="11" ref="Generic" />
- <errorcopy name="BadWindow" number="12" ref="Generic" />
-
- <!-- Events -->
- <event name="PbufferClobber" number="0">
- <field type="CARD16" name="event_type" />
- <field type="CARD16" name="draw_type" />
- <field type="glx:DRAWABLE" name="drawable" />
- <field type="CARD32" name="b_mask" />
- <field type="CARD16" name="aux_buffer" />
- <field type="CARD16" name="x" />
- <field type="CARD16" name="y" />
- <field type="CARD16" name="width" />
- <field type="CARD16" name="height" />
- <field type="CARD16" name="count" />
- <pad bytes="4" />
- </event>
-
- <!-- enums for PbufferClobber event/draw type -->
- <enum name="PBCET">
- <item name="Damaged">
- <value>0x8017</value>
- </item>
- <item name="Saved">
- <value>0x8018</value>
- </item>
- </enum>
-
- <enum name="PBCDT">
- <item name="Window">
- <value>0x8019</value>
- </item>
- <item name="Pbuffer">
- <value>0x801A</value>
- </item>
- </enum>
-
- <!-- Requests -->
- <request name="Render" opcode="1" combine-adjacent="true">
- <field type="CARD32" name="context_tag" />
- <list type="BYTE" name="data" />
- </request>
-
- <request name="RenderLarge" opcode="2">
- <field type="CARD32" name="context_tag" />
- <field type="CARD16" name="request_num" />
- <field type="CARD16" name="request_total" />
- <field type="CARD32" name="data_len" />
- <list type="BYTE" name="data">
- <fieldref>data_len</fieldref>
- </list>
- </request>
-
- <request name="CreateContext" opcode="3">
- <field type="glx:CONTEXT" name="context" />
- <field type="VISUALID" name="visual" />
- <field type="CARD32" name="screen" />
- <field type="CARD32" name="share_list" />
- <field type="BOOL" name="is_direct" />
- <pad bytes="3" />
- </request>
-
- <request name="DestroyContext" opcode="4">
- <field type="glx:CONTEXT" name="context" />
- </request>
-
- <request name="MakeCurrent" opcode="5">
- <field type="glx:DRAWABLE" name="drawable" />
- <field type="glx:CONTEXT" name="context" />
- <field type="CARD32" name="old_context_tag" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="context_tag" />
- <pad bytes="20" />
- </reply>
- </request>
-
- <request name="IsDirect" opcode="6">
- <field type="glx:CONTEXT" name="context" />
- <reply>
- <pad bytes="1" />
- <field type="BOOL" name="is_direct" />
- <pad bytes="23" />
- </reply>
- </request>
-
- <request name="QueryVersion" opcode="7">
- <field type="CARD32" name="major_version" />
- <field type="CARD32" name="minor_version" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="major_version" />
- <field type="CARD32" name="minor_version" />
- <pad bytes="16" />
- </reply>
- </request>
-
- <request name="WaitGL" opcode="8">
- <field type="CARD32" name="context_tag" />
- </request>
-
- <request name="WaitX" opcode="9">
- <field type="CARD32" name="context_tag" />
- </request>
-
- <request name="CopyContext" opcode="10">
- <field type="glx:CONTEXT" name="src" />
- <field type="glx:CONTEXT" name="dest" />
- <field type="CARD32" name="mask" />
- <field type="CARD32" name="src_context_tag" />
- </request>
-
- <!-- Enum for CopyContext: mask -->
- <enum name="GC">
- <item name="_GL_CURRENT_BIT"><value>0x00000001</value></item>
- <item name="_GL_POINT_BIT"><value>0x00000002</value></item>
- <item name="_GL_LINE_BIT"><value>0x00000004</value></item>
- <item name="_GL_POLYGON_BIT"><value>0x00000008</value></item>
- <item name="_GL_POLYGON_STIPPLE_BIT"><value>0x00000010</value></item>
- <item name="_GL_PIXEL_MODE_BIT"><value>0x00000020</value></item>
- <item name="_GL_LIGHTING_BIT"><value>0x00000040</value></item>
- <item name="_GL_FOG_BIT"><value>0x00000080</value></item>
- <item name="_GL_DEPTH_BUFFER_BIT"><value>0x00000100</value></item>
- <item name="_GL_ACCUM_BUFFER_BIT"><value>0x00000200</value></item>
- <item name="_GL_STENCIL_BUFFER_BIT"><value>0x00000400</value></item>
- <item name="_GL_VIEWPORT_BIT"><value>0x00000800</value></item>
- <item name="_GL_TRANSFORM_BIT"><value>0x00001000</value></item>
- <item name="_GL_ENABLE_BIT"><value>0x00002000</value></item>
- <item name="_GL_COLOR_BUFFER_BIT"><value>0x00004000</value></item>
- <item name="_GL_HINT_BIT"><value>0x00008000</value></item>
- <item name="_GL_EVAL_BIT"><value>0x00010000</value></item>
- <item name="_GL_LIST_BIT"><value>0x00020000</value></item>
- <item name="_GL_TEXTURE_BIT"><value>0x00040000</value></item>
- <item name="_GL_SCISSOR_BIT"><value>0x00080000</value></item>
- <item name="_GL_ALL_ATTRIB_BITS"><value>0x000ffffff</value></item>
- </enum>
-
- <request name="SwapBuffers" opcode="11">
- <field type="CARD32" name="context_tag" />
- <field type="glx:DRAWABLE" name="drawable" />
- </request>
-
- <request name="UseXFont" opcode="12">
- <field type="CARD32" name="context_tag" />
- <field type="FONT" name="font" />
- <field type="CARD32" name="first" />
- <field type="CARD32" name="count" />
- <field type="CARD32" name="list_base" />
- </request>
-
- <request name="CreateGLXPixmap" opcode="13">
- <field type="CARD32" name="screen" />
- <field type="VISUALID" name="visual" />
- <field type="xcb_types:PIXMAP" name="pixmap" />
- <field type="glx:PIXMAP" name="glxpixmap" />
- </request>
-
- <request name="GetVisualConfigs" opcode="14">
- <field type="CARD32" name="screen" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_visuals" />
- <field type="CARD32" name="num_props" />
- <pad bytes="16" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
- </reply>
- </request>
-
- <request name="DestroyGLXPixmap" opcode="15">
- <field type="glx:PIXMAP" name="glxpixmap" />
- </request>
-
- <!--
+<!-- target support: 1.3 -->
+ <xidtype name="PIXMAP"/>
+ <xidtype name="CONTEXT"/>
+ <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 -->
+ <field type="CARD32" name="bad_value"/>
+ <field type="CARD16" name="minor_opcode"/>
+ <field type="CARD8" name="major_opcode"/>
+ <pad bytes="21"/>
+ </error>
+ <errorcopy name="BadContext" number="0" ref="Generic"/>
+ <errorcopy name="BadContextState" number="1" ref="Generic"/>
+ <errorcopy name="BadDrawable" number="2" ref="Generic"/>
+ <errorcopy name="BadPixmap" number="3" ref="Generic"/>
+ <errorcopy name="BadContextTag" number="4" ref="Generic"/>
+ <errorcopy name="BadCurrentWindow" number="5" ref="Generic"/>
+ <errorcopy name="BadRenderRequest" number="6" ref="Generic"/>
+ <errorcopy name="BadLargeRequest" number="7" ref="Generic"/>
+ <errorcopy name="UnsupportedPrivateRequest" number="8" ref="Generic"/>
+ <errorcopy name="BadFBConfig" number="9" ref="Generic"/>
+ <errorcopy name="BadPbuffer" number="10" ref="Generic"/>
+ <errorcopy name="BadCurrentDrawable" number="11" ref="Generic"/>
+ <errorcopy name="BadWindow" number="12" ref="Generic"/>
+<!-- Events -->
+ <event name="PbufferClobber" number="0">
+ <field type="CARD16" name="event_type"/>
+ <field type="CARD16" name="draw_type"/>
+ <field type="glx:DRAWABLE" name="drawable"/>
+ <field type="CARD32" name="b_mask"/>
+ <field type="CARD16" name="aux_buffer"/>
+ <field type="CARD16" name="x"/>
+ <field type="CARD16" name="y"/>
+ <field type="CARD16" name="width"/>
+ <field type="CARD16" name="height"/>
+ <field type="CARD16" name="count"/>
+ <pad bytes="4"/>
+ </event>
+<!-- enums for PbufferClobber event/draw type -->
+ <enum name="PBCET">
+ <item name="Damaged">
+ <value>0x8017</value>
+ </item>
+ <item name="Saved">
+ <value>0x8018</value>
+ </item>
+ </enum>
+ <enum name="PBCDT">
+ <item name="Window">
+ <value>0x8019</value>
+ </item>
+ <item name="Pbuffer">
+ <value>0x801A</value>
+ </item>
+ </enum>
+<!-- Requests -->
+ <request name="Render" opcode="1" combine-adjacent="true">
+ <field type="CARD32" name="context_tag"/>
+ <list type="BYTE" name="data"/>
+ </request>
+ <request name="RenderLarge" opcode="2">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD16" name="request_num"/>
+ <field type="CARD16" name="request_total"/>
+ <field type="CARD32" name="data_len"/>
+ <list type="BYTE" name="data">
+ <fieldref>data_len</fieldref>
+ </list>
+ </request>
+ <request name="CreateContext" opcode="3">
+ <field type="glx:CONTEXT" name="context"/>
+ <field type="VISUALID" name="visual"/>
+ <field type="CARD32" name="screen"/>
+ <field type="CARD32" name="share_list"/>
+ <field type="BOOL" name="is_direct"/>
+ <pad bytes="3"/>
+ </request>
+ <request name="DestroyContext" opcode="4">
+ <field type="glx:CONTEXT" name="context"/>
+ </request>
+ <request name="MakeCurrent" opcode="5">
+ <field type="glx:DRAWABLE" name="drawable"/>
+ <field type="glx:CONTEXT" name="context"/>
+ <field type="CARD32" name="old_context_tag"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="context_tag"/>
+ <pad bytes="20"/>
+ </reply>
+ </request>
+ <request name="IsDirect" opcode="6">
+ <field type="glx:CONTEXT" name="context"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="BOOL" name="is_direct"/>
+ <pad bytes="23"/>
+ </reply>
+ </request>
+ <request name="QueryVersion" opcode="7">
+ <field type="CARD32" name="major_version"/>
+ <field type="CARD32" name="minor_version"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="major_version"/>
+ <field type="CARD32" name="minor_version"/>
+ <pad bytes="16"/>
+ </reply>
+ </request>
+ <request name="WaitGL" opcode="8">
+ <field type="CARD32" name="context_tag"/>
+ </request>
+ <request name="WaitX" opcode="9">
+ <field type="CARD32" name="context_tag"/>
+ </request>
+ <request name="CopyContext" opcode="10">
+ <field type="glx:CONTEXT" name="src"/>
+ <field type="glx:CONTEXT" name="dest"/>
+ <field type="CARD32" name="mask"/>
+ <field type="CARD32" name="src_context_tag"/>
+ </request>
+<!-- Enum for CopyContext: mask -->
+ <enum name="GC">
+ <item name="_GL_CURRENT_BIT">
+ <value>0x00000001</value>
+ </item>
+ <item name="_GL_POINT_BIT">
+ <value>0x00000002</value>
+ </item>
+ <item name="_GL_LINE_BIT">
+ <value>0x00000004</value>
+ </item>
+ <item name="_GL_POLYGON_BIT">
+ <value>0x00000008</value>
+ </item>
+ <item name="_GL_POLYGON_STIPPLE_BIT">
+ <value>0x00000010</value>
+ </item>
+ <item name="_GL_PIXEL_MODE_BIT">
+ <value>0x00000020</value>
+ </item>
+ <item name="_GL_LIGHTING_BIT">
+ <value>0x00000040</value>
+ </item>
+ <item name="_GL_FOG_BIT">
+ <value>0x00000080</value>
+ </item>
+ <item name="_GL_DEPTH_BUFFER_BIT">
+ <value>0x00000100</value>
+ </item>
+ <item name="_GL_ACCUM_BUFFER_BIT">
+ <value>0x00000200</value>
+ </item>
+ <item name="_GL_STENCIL_BUFFER_BIT">
+ <value>0x00000400</value>
+ </item>
+ <item name="_GL_VIEWPORT_BIT">
+ <value>0x00000800</value>
+ </item>
+ <item name="_GL_TRANSFORM_BIT">
+ <value>0x00001000</value>
+ </item>
+ <item name="_GL_ENABLE_BIT">
+ <value>0x00002000</value>
+ </item>
+ <item name="_GL_COLOR_BUFFER_BIT">
+ <value>0x00004000</value>
+ </item>
+ <item name="_GL_HINT_BIT">
+ <value>0x00008000</value>
+ </item>
+ <item name="_GL_EVAL_BIT">
+ <value>0x00010000</value>
+ </item>
+ <item name="_GL_LIST_BIT">
+ <value>0x00020000</value>
+ </item>
+ <item name="_GL_TEXTURE_BIT">
+ <value>0x00040000</value>
+ </item>
+ <item name="_GL_SCISSOR_BIT">
+ <value>0x00080000</value>
+ </item>
+ <item name="_GL_ALL_ATTRIB_BITS">
+ <value>0x000ffffff</value>
+ </item>
+ </enum>
+ <request name="SwapBuffers" opcode="11">
+ <field type="CARD32" name="context_tag"/>
+ <field type="glx:DRAWABLE" name="drawable"/>
+ </request>
+ <request name="UseXFont" opcode="12">
+ <field type="CARD32" name="context_tag"/>
+ <field type="FONT" name="font"/>
+ <field type="CARD32" name="first"/>
+ <field type="CARD32" name="count"/>
+ <field type="CARD32" name="list_base"/>
+ </request>
+ <request name="CreateGLXPixmap" opcode="13">
+ <field type="CARD32" name="screen"/>
+ <field type="VISUALID" name="visual"/>
+ <field type="xcb_types:PIXMAP" name="pixmap"/>
+ <field type="glx:PIXMAP" name="glxpixmap"/>
+ </request>
+ <request name="GetVisualConfigs" opcode="14">
+ <field type="CARD32" name="screen"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_visuals"/>
+ <field type="CARD32" name="num_props"/>
+ <pad bytes="16"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ </reply>
+ </request>
+ <request name="DestroyGLXPixmap" opcode="15">
+ <field type="glx:PIXMAP" name="glxpixmap"/>
+ </request>
+<!--
Context tag is not in the proto, should be part of the list of bytes
but every VendorPrivate and VendorPrivateWithReply request uses them
so it is safe to put them in. That's how Mesa does it.
-->
- <request name="VendorPrivate" opcode="16">
- <field type="CARD32" name="vendor_code" />
- <field type="CARD32" name="context_tag" />
- <list type="BYTE" name="data" />
- </request>
-
- <request name="VendorPrivateWithReply" opcode="17">
- <field type="CARD32" name="vendor_code" />
- <field type="CARD32" name="context_tag" />
- <list type="BYTE" name="data" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="retval" />
- <list type="BYTE" name="data1">
- <value>24</value>
- </list>
- <list type="BYTE" name="data2" />
- </reply>
- </request>
-
- <request name="QueryExtensionsString" opcode="18">
- <field type="CARD32" name="screen" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <pad bytes="16" />
- </reply>
- </request>
-
- <request name="QueryServerString" opcode="19">
- <field type="CARD32" name="screen" />
- <field type="CARD32" name="name" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="str_len" />
- <pad bytes="16" />
- <list type="CARD8" name="string">
- <fieldref>str_len</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="ClientInfo" opcode="20">
- <field type="CARD32" name="major_version" />
- <field type="CARD32" name="minor_version" />
- <field type="CARD32" name="str_len" />
- <list type="CARD8" name="string">
- <fieldref>str_len</fieldref>
- </list>
- </request>
-
- <!-- Start of GLX 1.3 Requests -->
-
- <request name="GetFBConfigs" opcode="21">
- <field type="CARD32" name="screen" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_FB_configs" />
- <field type="CARD32" name="num_properties" />
- <pad bytes="16" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
- </reply>
- </request>
-
- <request name="CreatePixmap" opcode="22">
- <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="CARD32" name="num_attribs" />
- </request>
-
- <request name="DestroyPixmap" opcode="23">
- <field type="glx:PIXMAP" name="glxpixmap" />
- </request>
-
- <request name="CreateNewContext" opcode="24">
- <field type="glx:CONTEXT" name="context" />
- <field type="CARD32" name="fbconfig" />
- <field type="SCREEN" name="screen" />
- <field type="CARD32" name="render_type" />
- <field type="CARD32" name="share_list" />
- <field type="BOOL" name="is_direct" />
- <field type="CARD8" name="reserved1" />
- <field type="CARD16" name="reserved2" />
- </request>
-
- <request name="QueryContext" opcode="25">
- <field type="glx:CONTEXT" name="context" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_attributes"/>
- <pad bytes="20" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
- </reply>
- </request>
-
- <request name="MakeContextCurrent" opcode="26">
- <field type="CARD32" name="old_context_tag" />
- <field type="glx:DRAWABLE" name="drawable" />
- <field type="glx:DRAWABLE" name="read_drawable" />
- <field type="glx:CONTEXT" name="context" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="context_tag" />
- <pad bytes="20" />
- </reply>
- </request>
-
- <request name="CreatePbuffer" opcode="27">
- <field type="SCREEN" name="screen" />
- <field type="FBCONFIG" name="fbconfig" />
- <field type="PBUFFER" name="pbuffer" />
- <field type="CARD32" name="num_attribs" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
- </request>
-
- <request name="DestroyPbuffer" opcode="28">
- <field type="PBUFFER" name="pbuffer" />
- </request>
-
- <request name="GetDrawableAttributes" opcode="29">
- <field type="glx:DRAWABLE" name="drawable" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_attribs" />
- <pad bytes="20" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
- </reply>
- </request>
-
- <request name="ChangeDrawableAttributes" opcode="30">
- <field type="glx:DRAWABLE" name="drawable" />
- <field type="CARD32" name="num_attribs" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
- </request>
-
- <request name="CreateWindow" opcode="31">
- <field type="SCREEN" name="screen" />
- <field type="FBCONFIG" name="fbconfig" />
- <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" />
- </request>
-
- <request name="DeleteWindow" opcode="32">
- <field type="glx:WINDOW" name="glxwindow" />
- </request>
-
- <!-- Requests for GL Non-rendering Commands (single ops) -->
-
- <request name="NewList" opcode="101">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="list" />
- <field type="CARD32" name="mode" />
- </request>
-
- <request name="EndList" opcode="102">
- <field type="CARD32" name="context_tag" />
- </request>
-
- <request name="DeleteLists" opcode="103">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="list" />
- <field type="INT32" name="range" />
- </request>
-
- <request name="GenLists" opcode="104">
- <field type="CARD32" name="context_tag" />
- <field type="INT32" name="range" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="ret_val" />
- </reply>
- </request>
-
- <request name="FeedbackBuffer" opcode="105">
- <field type="CARD32" name="context_tag" />
- <field type="INT32" name="size" />
- <field type="INT32" name="type" />
- </request>
-
- <request name="SelectBuffer" opcode="106">
- <field type="CARD32" name="context_tag" />
- <field type="INT32" name="size" />
- <!-- the reply is actually returned in the data
+ <request name="VendorPrivate" opcode="16">
+ <field type="CARD32" name="vendor_code"/>
+ <field type="CARD32" name="context_tag"/>
+ <list type="BYTE" name="data"/>
+ </request>
+ <request name="VendorPrivateWithReply" opcode="17">
+ <field type="CARD32" name="vendor_code"/>
+ <field type="CARD32" name="context_tag"/>
+ <list type="BYTE" name="data"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="retval"/>
+ <list type="BYTE" name="data1">
+ <value>24</value>
+ </list>
+ <list type="BYTE" name="data2"/>
+ </reply>
+ </request>
+ <request name="QueryExtensionsString" opcode="18">
+ <field type="CARD32" name="screen"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <pad bytes="16"/>
+ </reply>
+ </request>
+ <request name="QueryServerString" opcode="19">
+ <field type="CARD32" name="screen"/>
+ <field type="CARD32" name="name"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="str_len"/>
+ <pad bytes="16"/>
+ <list type="CARD8" name="string">
+ <fieldref>str_len</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="ClientInfo" opcode="20">
+ <field type="CARD32" name="major_version"/>
+ <field type="CARD32" name="minor_version"/>
+ <field type="CARD32" name="str_len"/>
+ <list type="CARD8" name="string">
+ <fieldref>str_len</fieldref>
+ </list>
+ </request>
+<!-- Start of GLX 1.3 Requests -->
+ <request name="GetFBConfigs" opcode="21">
+ <field type="CARD32" name="screen"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_FB_configs"/>
+ <field type="CARD32" name="num_properties"/>
+ <pad bytes="16"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ </reply>
+ </request>
+ <request name="CreatePixmap" opcode="22">
+ <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="CARD32" name="num_attribs"/>
+ </request>
+ <request name="DestroyPixmap" opcode="23">
+ <field type="glx:PIXMAP" name="glxpixmap"/>
+ </request>
+ <request name="CreateNewContext" opcode="24">
+ <field type="glx:CONTEXT" name="context"/>
+ <field type="CARD32" name="fbconfig"/>
+ <field type="SCREEN" name="screen"/>
+ <field type="CARD32" name="render_type"/>
+ <field type="CARD32" name="share_list"/>
+ <field type="BOOL" name="is_direct"/>
+ <field type="CARD8" name="reserved1"/>
+ <field type="CARD16" name="reserved2"/>
+ </request>
+ <request name="QueryContext" opcode="25">
+ <field type="glx:CONTEXT" name="context"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_attributes"/>
+ <pad bytes="20"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ </reply>
+ </request>
+ <request name="MakeContextCurrent" opcode="26">
+ <field type="CARD32" name="old_context_tag"/>
+ <field type="glx:DRAWABLE" name="drawable"/>
+ <field type="glx:DRAWABLE" name="read_drawable"/>
+ <field type="glx:CONTEXT" name="context"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="context_tag"/>
+ <pad bytes="20"/>
+ </reply>
+ </request>
+ <request name="CreatePbuffer" opcode="27">
+ <field type="SCREEN" name="screen"/>
+ <field type="FBCONFIG" name="fbconfig"/>
+ <field type="PBUFFER" name="pbuffer"/>
+ <field type="CARD32" name="num_attribs"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ </request>
+ <request name="DestroyPbuffer" opcode="28">
+ <field type="PBUFFER" name="pbuffer"/>
+ </request>
+ <request name="GetDrawableAttributes" opcode="29">
+ <field type="glx:DRAWABLE" name="drawable"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_attribs"/>
+ <pad bytes="20"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ </reply>
+ </request>
+ <request name="ChangeDrawableAttributes" opcode="30">
+ <field type="glx:DRAWABLE" name="drawable"/>
+ <field type="CARD32" name="num_attribs"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ </request>
+ <request name="CreateWindow" opcode="31">
+ <field type="SCREEN" name="screen"/>
+ <field type="FBCONFIG" name="fbconfig"/>
+ <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"/>
+ </request>
+ <request name="DeleteWindow" opcode="32">
+ <field type="glx:WINDOW" name="glxwindow"/>
+ </request>
+<!-- Requests for GL Non-rendering Commands (single ops) -->
+ <request name="NewList" opcode="101">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="list"/>
+ <field type="CARD32" name="mode"/>
+ </request>
+ <request name="EndList" opcode="102">
+ <field type="CARD32" name="context_tag"/>
+ </request>
+ <request name="DeleteLists" opcode="103">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="list"/>
+ <field type="INT32" name="range"/>
+ </request>
+ <request name="GenLists" opcode="104">
+ <field type="CARD32" name="context_tag"/>
+ <field type="INT32" name="range"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="ret_val"/>
+ </reply>
+ </request>
+ <request name="FeedbackBuffer" opcode="105">
+ <field type="CARD32" name="context_tag"/>
+ <field type="INT32" name="size"/>
+ <field type="INT32" name="type"/>
+ </request>
+ <request name="SelectBuffer" opcode="106">
+ <field type="CARD32" name="context_tag"/>
+ <field type="INT32" name="size"/>
+<!-- the reply is actually returned in the data
of the next RenderMode request -->
- </request>
-
-
- <request name="RenderMode" opcode="107">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="mode" />
- <!--
+ </request>
+ <request name="RenderMode" opcode="107">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="mode"/>
+<!--
This reply is only if RM was previously feedback/selection.
If it was in feedback mode then data is FLOAT32.
If previously in render mode there is no reply.
-->
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="ret_val" />
- <field type="CARD32" name="n" />
- <field type="CARD32" name="new_mode" />
- <pad bytes="12" />
- <list type="CARD32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <enum name="RM">
- <item name="_GL_RENDER"><value>0x1C00</value></item>
- <item name="_GL_FEEDBACK"><value>0x1C01</value></item>
- <item name="_GL_SELECT"><value>0x1C02</value></item>
- </enum>
-
- <request name="Finish" opcode="108">
- <field type="CARD32" name="context_tag" />
- <reply>
- <pad bytes="1" />
- </reply>
- </request>
-
- <request name="PixelStoref" opcode="109">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="pname" />
- <field type="FLOAT32" name="datum" />
- </request>
-
- <request name="PixelStorei" opcode="110">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="pname" />
- <field type="INT32" name="datum" />
- </request>
-
- <request name="ReadPixels" opcode="111">
- <field type="CARD32" name="context_tag" />
- <field type="INT32" name="x" />
- <field type="INT32" name="y" />
- <field type="INT32" name="width" />
- <field type="INT32" name="height" />
- <field type="CARD32" name="format" />
- <field type="CARD32" name="type" />
- <field type="BOOL" name="swap_bytes" />
- <field type="BOOL" name="lsb_first" />
- <reply>
- <pad bytes="1" />
- <pad bytes="24" />
- <list type="BYTE" name="data" />
- </reply>
- </request>
-
- <!-- FIXME:
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="ret_val"/>
+ <field type="CARD32" name="n"/>
+ <field type="CARD32" name="new_mode"/>
+ <pad bytes="12"/>
+ <list type="CARD32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <enum name="RM">
+ <item name="_GL_RENDER">
+ <value>0x1C00</value>
+ </item>
+ <item name="_GL_FEEDBACK">
+ <value>0x1C01</value>
+ </item>
+ <item name="_GL_SELECT">
+ <value>0x1C02</value>
+ </item>
+ </enum>
+ <request name="Finish" opcode="108">
+ <field type="CARD32" name="context_tag"/>
+ <reply>
+ <pad bytes="1"/>
+ </reply>
+ </request>
+ <request name="PixelStoref" opcode="109">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="pname"/>
+ <field type="FLOAT32" name="datum"/>
+ </request>
+ <request name="PixelStorei" opcode="110">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="pname"/>
+ <field type="INT32" name="datum"/>
+ </request>
+ <request name="ReadPixels" opcode="111">
+ <field type="CARD32" name="context_tag"/>
+ <field type="INT32" name="x"/>
+ <field type="INT32" name="y"/>
+ <field type="INT32" name="width"/>
+ <field type="INT32" name="height"/>
+ <field type="CARD32" name="format"/>
+ <field type="CARD32" name="type"/>
+ <field type="BOOL" name="swap_bytes"/>
+ <field type="BOOL" name="lsb_first"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="24"/>
+ <list type="BYTE" name="data"/>
+ </reply>
+ </request>
+<!-- FIXME:
All the Get* functions can return different stuff for replies.
Hopefully xcb will support multiple reply structures at some point
but for now... grrrr
Starts on page 58/180
-->
- <request name="GetBooleanv" opcode="112">
- <field type="CARD32" name="context_tag" />
- <field type="INT32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="BOOL" name="datum" />
- <pad bytes="15" />
- <list type="BOOL" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetClipPlane" opcode="113">
- <field type="CARD32" name="context_tag" />
- <field type="INT32" name="plane" />
- <reply>
- <pad bytes="1" />
- <pad bytes="24" />
- <list type="FLOAT64" name="data" />
- </reply>
- </request>
-
- <request name="GetDoublev" opcode="114">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT64" name="datum" />
- <pad bytes="8" />
- <list type="FLOAT64" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetError" opcode="115">
- <field type="CARD32" name="context_tag" />
- <reply>
- <pad bytes="1" />
- <field type="INT32" name="error" />
- </reply>
- </request>
-
- <request name="GetFloatv" opcode="116">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetIntegerv" opcode="117">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetLightfv" opcode="118">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="light" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetLightiv" opcode="119">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="light" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetMapdv" opcode="120">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="query" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT64" name="datum" />
- <pad bytes="8" />
- <list type="FLOAT64" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetMapfv" opcode="121">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="query" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetMapiv" opcode="122">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="query" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetMaterialfv" opcode="123">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="face" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetMaterialiv" opcode="124">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="face" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetPixelMapfv" opcode="125">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="map" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetPixelMapuiv" opcode="126">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="map" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="CARD32" name="datum" />
- <pad bytes="12" />
- <list type="CARD32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetPixelMapusv" opcode="127">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="map" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="CARD16" name="datum" />
- <pad bytes="16" />
- <list type="CARD16" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetPolygonStipple" opcode="128">
- <field type="CARD32" name="context_tag" />
- <field type="BOOL" name="lsb_first" />
- <reply>
- <pad bytes="1" />
- <pad bytes="24" />
- <list type="BYTE" name="data" />
- </reply>
- </request>
-
-
- <request name="GetString" opcode="129">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="name" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <pad bytes="16" />
- <list type="CARD8" name="string">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetTexEnvfv" opcode="130">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetTexEnviv" opcode="131">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetTexGendv" opcode="132">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="coord" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT64" name="datum" />
- <pad bytes="8" />
- <list type="FLOAT64" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetTexGenfv" opcode="133">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="coord" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetTexGeniv" opcode="134">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="coord" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetTexImage" opcode="135">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="INT32" name="level" />
- <field type="CARD32" name="format" />
- <field type="CARD32" name="type" />
- <field type="BOOL" name="swap_bytes" />
- <reply>
- <pad bytes="1" />
- <pad bytes="8" />
- <field type="INT32" name="width" />
- <field type="INT32" name="height" />
- <field type="INT32" name="depth" />
- <pad bytes="4" />
- <list type="BYTE" name="data" />
- </reply>
- </request>
-
-
- <request name="GetTexParameterfv" opcode="136">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetTexParameteriv" opcode="137">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetTexLevelParameterfv" opcode="138">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="INT32" name="level" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetTexLevelParameteriv" opcode="139">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="INT32" name="level" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="IsList" opcode="141" >
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="list" />
- <reply>
- <pad bytes="1" />
- <field type="BOOL32" name="ret_val" />
- </reply>
- </request>
-
- <request name="Flush" opcode="142">
- <field type="CARD32" name="context_tag" />
- </request>
-
- <request name="AreTexturesResident" opcode="143">
- <field type="CARD32" name="context_tag" />
- <field type="INT32" name="n" />
- <list type="CARD32" name="textures">
- <fieldref>n</fieldref>
- </list>
- <reply>
- <pad bytes="1" />
- <field type="BOOL32" name="ret_val" />
- <pad bytes="20" />
- <list type="BOOL" name="data" />
- </reply>
- </request>
-
- <request name="DeleteTextures" opcode="144">
- <field type="CARD32" name="context_tag" />
- <field type="INT32" name="n" />
- <list type="CARD32" name="textures">
- <fieldref>n</fieldref>
- </list>
- </request>
-
- <request name="GenTextures" opcode="145">
- <field type="CARD32" name="context_tag" />
- <field type="INT32" name="n" />
- <reply>
- <pad bytes="1" />
- <pad bytes="24" />
- <list type="CARD32" name="data" />
- </reply>
- </request>
-
- <request name="IsTexture" opcode="146">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="texture" />
- <reply>
- <pad bytes="1" />
- <field type="BOOL32" name="ret_val" />
- </reply>
- </request>
-
- <request name="GetColorTable" opcode="147">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="format" />
- <field type="CARD32" name="type" />
- <field type="BOOL" name="swap_bytes" />
- <reply>
- <pad bytes="1" />
- <pad bytes="8" />
- <field type="INT32" name="width" />
- <pad bytes="12" />
- <list type="BYTE" name="data" />
- </reply>
- </request>
-
- <request name="GetColorTableParameterfv" opcode="148">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetColorTableParameteriv" opcode="149">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetConvolutionFilter" opcode="150">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="format" />
- <field type="CARD32" name="type" />
- <field type="BOOL" name="swap_bytes" />
- <reply>
- <pad bytes="1" />
- <pad bytes="8" />
- <field type="INT32" name="width" />
- <field type="INT32" name="height" />
- <pad bytes="8" />
- <list type="BYTE" name="data" />
- </reply>
- </request>
-
-
- <request name="GetConvolutionParameterfv" opcode="151">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetConvolutionParameteriv" opcode="152">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetSeparableFilter" opcode="153">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="format" />
- <field type="CARD32" name="type" />
- <field type="BOOL" name="swap_bytes" />
- <reply>
- <pad bytes="1" />
- <pad bytes="8" />
- <field type="INT32" name="row_w" />
- <field type="INT32" name="col_h" />
- <pad bytes="8" />
- <list type="BYTE" name="rows_and_cols" />
- </reply>
- </request>
-
- <request name="GetHistogram" opcode="154">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="format" />
- <field type="CARD32" name="type" />
- <field type="BOOL" name="swap_bytes" />
- <field type="BOOL" name="reset" />
- <reply>
- <pad bytes="1" />
- <pad bytes="8" />
- <field type="INT32" name="width" />
- <pad bytes="12" />
- <list type="BYTE" name="data" />
- </reply>
- </request>
-
-
- <request name="GetHistogramParameterfv" opcode="155">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetHistogramParameteriv" opcode="156">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetMinmax" opcode="157">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="format" />
- <field type="CARD32" name="type" />
- <field type="BOOL" name="swap_bytes" />
- <field type="BOOL" name="reset" />
- <reply>
- <pad bytes="1" />
- <pad bytes="24" />
- <list type="BYTE" name="data" />
- </reply>
- </request>
-
- <request name="GetMinmaxParameterfv" opcode="158">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="FLOAT32" name="datum" />
- <pad bytes="12" />
- <list type="FLOAT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetMinmaxParameteriv" opcode="159">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <!--
+ <request name="GetBooleanv" opcode="112">
+ <field type="CARD32" name="context_tag"/>
+ <field type="INT32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="BOOL" name="datum"/>
+ <pad bytes="15"/>
+ <list type="BOOL" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetClipPlane" opcode="113">
+ <field type="CARD32" name="context_tag"/>
+ <field type="INT32" name="plane"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="24"/>
+ <list type="FLOAT64" name="data"/>
+ </reply>
+ </request>
+ <request name="GetDoublev" opcode="114">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT64" name="datum"/>
+ <pad bytes="8"/>
+ <list type="FLOAT64" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetError" opcode="115">
+ <field type="CARD32" name="context_tag"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="INT32" name="error"/>
+ </reply>
+ </request>
+ <request name="GetFloatv" opcode="116">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetIntegerv" opcode="117">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetLightfv" opcode="118">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="light"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetLightiv" opcode="119">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="light"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetMapdv" opcode="120">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="query"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT64" name="datum"/>
+ <pad bytes="8"/>
+ <list type="FLOAT64" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetMapfv" opcode="121">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="query"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetMapiv" opcode="122">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="query"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetMaterialfv" opcode="123">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="face"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetMaterialiv" opcode="124">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="face"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetPixelMapfv" opcode="125">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="map"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetPixelMapuiv" opcode="126">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="map"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="CARD32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="CARD32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetPixelMapusv" opcode="127">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="map"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="CARD16" name="datum"/>
+ <pad bytes="16"/>
+ <list type="CARD16" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetPolygonStipple" opcode="128">
+ <field type="CARD32" name="context_tag"/>
+ <field type="BOOL" name="lsb_first"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="24"/>
+ <list type="BYTE" name="data"/>
+ </reply>
+ </request>
+ <request name="GetString" opcode="129">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="name"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <pad bytes="16"/>
+ <list type="CARD8" name="string">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetTexEnvfv" opcode="130">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetTexEnviv" opcode="131">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetTexGendv" opcode="132">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="coord"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT64" name="datum"/>
+ <pad bytes="8"/>
+ <list type="FLOAT64" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetTexGenfv" opcode="133">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="coord"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetTexGeniv" opcode="134">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="coord"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetTexImage" opcode="135">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="INT32" name="level"/>
+ <field type="CARD32" name="format"/>
+ <field type="CARD32" name="type"/>
+ <field type="BOOL" name="swap_bytes"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="8"/>
+ <field type="INT32" name="width"/>
+ <field type="INT32" name="height"/>
+ <field type="INT32" name="depth"/>
+ <pad bytes="4"/>
+ <list type="BYTE" name="data"/>
+ </reply>
+ </request>
+ <request name="GetTexParameterfv" opcode="136">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetTexParameteriv" opcode="137">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetTexLevelParameterfv" opcode="138">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="INT32" name="level"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetTexLevelParameteriv" opcode="139">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="INT32" name="level"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="IsList" opcode="141">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="list"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="BOOL32" name="ret_val"/>
+ </reply>
+ </request>
+ <request name="Flush" opcode="142">
+ <field type="CARD32" name="context_tag"/>
+ </request>
+ <request name="AreTexturesResident" opcode="143">
+ <field type="CARD32" name="context_tag"/>
+ <field type="INT32" name="n"/>
+ <list type="CARD32" name="textures">
+ <fieldref>n</fieldref>
+ </list>
+ <reply>
+ <pad bytes="1"/>
+ <field type="BOOL32" name="ret_val"/>
+ <pad bytes="20"/>
+ <list type="BOOL" name="data"/>
+ </reply>
+ </request>
+ <request name="DeleteTextures" opcode="144">
+ <field type="CARD32" name="context_tag"/>
+ <field type="INT32" name="n"/>
+ <list type="CARD32" name="textures">
+ <fieldref>n</fieldref>
+ </list>
+ </request>
+ <request name="GenTextures" opcode="145">
+ <field type="CARD32" name="context_tag"/>
+ <field type="INT32" name="n"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="24"/>
+ <list type="CARD32" name="data"/>
+ </reply>
+ </request>
+ <request name="IsTexture" opcode="146">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="texture"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="BOOL32" name="ret_val"/>
+ </reply>
+ </request>
+ <request name="GetColorTable" opcode="147">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="format"/>
+ <field type="CARD32" name="type"/>
+ <field type="BOOL" name="swap_bytes"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="8"/>
+ <field type="INT32" name="width"/>
+ <pad bytes="12"/>
+ <list type="BYTE" name="data"/>
+ </reply>
+ </request>
+ <request name="GetColorTableParameterfv" opcode="148">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetColorTableParameteriv" opcode="149">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetConvolutionFilter" opcode="150">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="format"/>
+ <field type="CARD32" name="type"/>
+ <field type="BOOL" name="swap_bytes"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="8"/>
+ <field type="INT32" name="width"/>
+ <field type="INT32" name="height"/>
+ <pad bytes="8"/>
+ <list type="BYTE" name="data"/>
+ </reply>
+ </request>
+ <request name="GetConvolutionParameterfv" opcode="151">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetConvolutionParameteriv" opcode="152">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetSeparableFilter" opcode="153">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="format"/>
+ <field type="CARD32" name="type"/>
+ <field type="BOOL" name="swap_bytes"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="8"/>
+ <field type="INT32" name="row_w"/>
+ <field type="INT32" name="col_h"/>
+ <pad bytes="8"/>
+ <list type="BYTE" name="rows_and_cols"/>
+ </reply>
+ </request>
+ <request name="GetHistogram" opcode="154">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="format"/>
+ <field type="CARD32" name="type"/>
+ <field type="BOOL" name="swap_bytes"/>
+ <field type="BOOL" name="reset"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="8"/>
+ <field type="INT32" name="width"/>
+ <pad bytes="12"/>
+ <list type="BYTE" name="data"/>
+ </reply>
+ </request>
+ <request name="GetHistogramParameterfv" opcode="155">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetHistogramParameteriv" opcode="156">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetMinmax" opcode="157">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="format"/>
+ <field type="CARD32" name="type"/>
+ <field type="BOOL" name="swap_bytes"/>
+ <field type="BOOL" name="reset"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="24"/>
+ <list type="BYTE" name="data"/>
+ </reply>
+ </request>
+ <request name="GetMinmaxParameterfv" opcode="158">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="FLOAT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="FLOAT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetMinmaxParameteriv" opcode="159">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+<!--
GLX Extensions
* XXX: So far only define non-rendering commands.
* Only those extensions that affect the GLX wire protocol are listed.
-->
-
- <!--
+<!--
GL_ARB_texture_compression
http://oss.sgi.com/projects/ogl-sample/registry/ARB/texture_compression.txt
-->
- <request name="GetCompressedTexImageARB" opcode="160">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="INT32" name="level" />
- <reply>
- <pad bytes="1" />
- <pad bytes="8" />
- <field type="INT32" name="size" />
- <pad bytes="12" />
- <list type="BYTE" name="data" />
- </reply>
- </request>
-
-
- <!--
+ <request name="GetCompressedTexImageARB" opcode="160">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="INT32" name="level"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="8"/>
+ <field type="INT32" name="size"/>
+ <pad bytes="12"/>
+ <list type="BYTE" name="data"/>
+ </reply>
+ </request>
+<!--
GL_ARB_occlusion_query
http://oss.sgi.com/projects/ogl-sample/registry/ARB/occlusion_query.txt
-->
-
- <request name="DeleteQueriesARB" opcode="161">
- <field type="CARD32" name="context_tag" />
- <field type="INT32" name="n" />
- <list type="CARD32" name="ids">
- <fieldref>n</fieldref>
- </list>
- </request>
-
- <request name="GenQueriesARB" opcode="162">
- <field type="CARD32" name="context_tag" />
- <field type="INT32" name="n" />
- <reply>
- <pad bytes="1" />
- <pad bytes="24" />
- <list type="CARD32" name="data" />
- </reply>
- </request>
-
- <request name="IsQueryARB" opcode="163">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="id" />
- <reply>
- <pad bytes="1" />
- <field type="BOOL32" name="ret_val" />
- </reply>
- </request>
-
- <request name="GetQueryivARB" opcode="164">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="target" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetQueryObjectivARB" opcode="165">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="id" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="INT32" name="datum" />
- <pad bytes="12" />
- <list type="INT32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetQueryObjectuivARB" opcode="166">
- <field type="CARD32" name="context_tag" />
- <field type="CARD32" name="id" />
- <field type="CARD32" name="pname" />
- <reply>
- <pad bytes="1" />
- <pad bytes="4" />
- <field type="CARD32" name="n" />
- <field type="CARD32" name="datum" />
- <pad bytes="12" />
- <list type="CARD32" name="data">
- <fieldref>n</fieldref>
- </list>
- </reply>
- </request>
-
- <!--
+ <request name="DeleteQueriesARB" opcode="161">
+ <field type="CARD32" name="context_tag"/>
+ <field type="INT32" name="n"/>
+ <list type="CARD32" name="ids">
+ <fieldref>n</fieldref>
+ </list>
+ </request>
+ <request name="GenQueriesARB" opcode="162">
+ <field type="CARD32" name="context_tag"/>
+ <field type="INT32" name="n"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="24"/>
+ <list type="CARD32" name="data"/>
+ </reply>
+ </request>
+ <request name="IsQueryARB" opcode="163">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="id"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="BOOL32" name="ret_val"/>
+ </reply>
+ </request>
+ <request name="GetQueryivARB" opcode="164">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="target"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetQueryObjectivARB" opcode="165">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="id"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="INT32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="INT32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetQueryObjectuivARB" opcode="166">
+ <field type="CARD32" name="context_tag"/>
+ <field type="CARD32" name="id"/>
+ <field type="CARD32" name="pname"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="4"/>
+ <field type="CARD32" name="n"/>
+ <field type="CARD32" name="datum"/>
+ <pad bytes="12"/>
+ <list type="CARD32" name="data">
+ <fieldref>n</fieldref>
+ </list>
+ </reply>
+ </request>
+<!--
GL_ARB_vertex_program
http://oss.sgi.com/projects/ogl-sample/registry/ARB/vertex_program.txt
XXX: Need to write up vops
- -->
-
- <!--
+ -->
+<!--
GL_ARB_fragment_program
http://oss.sgi.com/projects/ogl-sample/registry/ARB/fragment_program.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_SGIS_texture_filter4
http://oss.sgi.com/projects/ogl-sample/registry/SGIS/texture_filter4.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_EXT_histogram
http://oss.sgi.com/projects/ogl-sample/registry/EXT/histogram.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_EXT_convolution
http://oss.sgi.com/projects/ogl-sample/registry/EXT/convolution.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_SGI_color_table
http://oss.sgi.com/projects/ogl-sample/registry/SGI/color_table.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_EXT_texture_object
http://oss.sgi.com/projects/ogl-sample/registry/EXT/texture_object.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_SGIS_detail_texture
http://oss.sgi.com/projects/ogl-sample/registry/SGIS/detail_texture.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_SGIS_sharpen_texture
http://oss.sgi.com/projects/ogl-sample/registry/SGIS/sharpen_texture.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_SGI_make_current_read
http://oss.sgi.com/projects/ogl-sample/registry/SGI/make_current_read.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_EXT_import_context
http://oss.sgi.com/projects/ogl-sample/registry/EXT/import_context.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_SGIX_fbconfig
http://oss.sgi.com/projects/ogl-sample/registry/SGIX/fbconfig.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_SGIX_pbuffer
http://oss.sgi.com/projects/ogl-sample/registry/SGIX/pbuffer.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_EXT_pixel_transform
http://oss.sgi.com/projects/ogl-sample/registry/EXT/pixel_transform.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_NV_register_combiners
http://oss.sgi.com/projects/ogl-sample/registry/NV/register_combiners.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_NV_fence
http://oss.sgi.com/projects/ogl-sample/registry/NV/fence.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_NV_register_combiners2
http://oss.sgi.com/projects/ogl-sample/registry/NV/register_combiners2.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_NV_vertex_program
http://oss.sgi.com/projects/ogl-sample/registry/NV/vertex_program.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_NV_vertex_program
http://oss.sgi.com/projects/ogl-sample/registry/NV/vertex_program.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_NV_occlusion_query
http://oss.sgi.com/projects/ogl-sample/registry/NV/occlusion_query.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_NV_fragment_program
http://oss.sgi.com/projects/ogl-sample/registry/NV/fragment_program.txt
XXX: Need to write up vops
-->
-
- <!--
+<!--
GL_OES_single_precision
http://oss.sgi.com/projects/ogl-sample/registry/OES/single_precision.txt
XXX: Need to write up vops
-->
-
</xcb>
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index 967da36..8448a1f 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -25,113 +25,124 @@ 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 -->
-
- <enum name="Rotation">
- <item name="Rotate_0"><value>1</value></item>
- <item name="Rotate_90"><value>2</value></item>
- <item name="Rotate_180"><value>4</value></item>
- <item name="Rotate_270"><value>8</value></item>
- <item name="Reflect_X"><value>16</value></item>
- <item name="Reflect_Y"><value>32</value></item>
- </enum>
-
- <struct name="RefreshRates">
- <field type="CARD16" name="nRates" />
- <list type="CARD16" name="rates">
- <fieldref>nRates</fieldref>
- </list>
- </struct>
-
- <request name="QueryVersion" opcode="0">
- <field type="CARD32" name="major_version" />
- <field type="CARD32" name="minor_version" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="major_version" />
- <field type="CARD32" name="minor_version" />
- <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
+<!-- Implements version 1.1 of RANDR -->
+ <enum name="Rotation">
+ <item name="Rotate_0">
+ <value>1</value>
+ </item>
+ <item name="Rotate_90">
+ <value>2</value>
+ </item>
+ <item name="Rotate_180">
+ <value>4</value>
+ </item>
+ <item name="Rotate_270">
+ <value>8</value>
+ </item>
+ <item name="Reflect_X">
+ <value>16</value>
+ </item>
+ <item name="Reflect_Y">
+ <value>32</value>
+ </item>
+ </enum>
+ <struct name="RefreshRates">
+ <field type="CARD16" name="nRates"/>
+ <list type="CARD16" name="rates">
+ <fieldref>nRates</fieldref>
+ </list>
+ </struct>
+ <request name="QueryVersion" opcode="0">
+ <field type="CARD32" name="major_version"/>
+ <field type="CARD32" name="minor_version"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="major_version"/>
+ <field type="CARD32" name="minor_version"/>
+ <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!
-->
- <request name="SetScreenConfig" opcode="2">
- <field type="WINDOW" name="drawable" />
- <field type="TIMESTAMP" name="time" />
- <field type="TIMESTAMP" name="config_time" />
- <field type="CARD16" name="sizeID" />
- <field type="INT16" name="rotation" />
- <field type="CARD16" name="refresh" />
- <pad bytes="2" />
- <reply>
- <field type="CARD8" name="status" />
- <field type="TIMESTAMP" name="time" />
- <field type="TIMESTAMP" name="config_time" />
- <field type="WINDOW" name="root" />
- <field type="CARD16" name="subpixel_order" />
- <pad bytes="10" />
- </reply>
- </request>
-
- <enum name="SetConfig">
- <item name="Success"><value>0</value></item>
- <item name="InvalidConfigTime"><value>1</value></item>
- <item name="InvalidTime"><value>2</value></item>
- <item name="Failed"><value>3</value></item>
- </enum>
-
- <request name="SelectInput" opcode="4">
- <field type="WINDOW" name="window" />
- <field type="CARD16" name="enable" />
- <pad bytes="2" />
- </request>
-
- <!--
+ <request name="SetScreenConfig" opcode="2">
+ <field type="WINDOW" name="drawable"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="TIMESTAMP" name="config_time"/>
+ <field type="CARD16" name="sizeID"/>
+ <field type="INT16" name="rotation"/>
+ <field type="CARD16" name="refresh"/>
+ <pad bytes="2"/>
+ <reply>
+ <field type="CARD8" name="status"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="TIMESTAMP" name="config_time"/>
+ <field type="WINDOW" name="root"/>
+ <field type="CARD16" name="subpixel_order"/>
+ <pad bytes="10"/>
+ </reply>
+ </request>
+ <enum name="SetConfig">
+ <item name="Success">
+ <value>0</value>
+ </item>
+ <item name="InvalidConfigTime">
+ <value>1</value>
+ </item>
+ <item name="InvalidTime">
+ <value>2</value>
+ </item>
+ <item name="Failed">
+ <value>3</value>
+ </item>
+ </enum>
+ <request name="SelectInput" opcode="4">
+ <field type="WINDOW" name="window"/>
+ <field type="CARD16" name="enable"/>
+ <pad bytes="2"/>
+ </request>
+<!--
I think this is correct. It works. though I believe nInfo is a bit high...
-->
- <request name="GetScreenInfo" opcode="5">
- <field type="WINDOW" name="window" />
- <reply>
- <field type="CARD8" name="rotations" />
- <field type="WINDOW" name="root" />
- <field type="TIMESTAMP" name="time" />
- <field type="TIMESTAMP" name="config_time" />
- <field type="CARD16" name="nSizes" />
- <field type="CARD16" name="sizeID" />
- <field type="INT16" name="rotation" />
- <field type="CARD16" name="rate" />
- <field type="CARD16" name="nInfo" />
- <pad bytes="2" />
- <list type="ScreenSize" name="sizes">
- <fieldref>nSizes</fieldref>
- </list>
- <list type="RefreshRates" name="rates">
- <op op="-">
- <fieldref>nInfo</fieldref>
- <fieldref>nSizes</fieldref>
- </op>
- </list>
- </reply>
- </request>
-
- <enum name="SM" >
- <item name="ScreenChangeNotify"><value>1</value></item>
- </enum>
-
- <event name="ScreenChangeNotify" number="0">
- <field type="CARD8" name="rotation" />
- <field type="TIMESTAMP" name="time" />
- <field type="TIMESTAMP" name="config_time" />
- <field type="WINDOW" name="root" />
- <field type="WINDOW" name="request_window" />
- <field type="CARD16" name="sizeID" />
- <field type="CARD16" name="subpixel_order" />
- <field type="ScreenSize" />
- </event>
-
+ <request name="GetScreenInfo" opcode="5">
+ <field type="WINDOW" name="window"/>
+ <reply>
+ <field type="CARD8" name="rotations"/>
+ <field type="WINDOW" name="root"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="TIMESTAMP" name="config_time"/>
+ <field type="CARD16" name="nSizes"/>
+ <field type="CARD16" name="sizeID"/>
+ <field type="INT16" name="rotation"/>
+ <field type="CARD16" name="rate"/>
+ <field type="CARD16" name="nInfo"/>
+ <pad bytes="2"/>
+ <list type="ScreenSize" name="sizes">
+ <fieldref>nSizes</fieldref>
+ </list>
+ <list type="RefreshRates" name="rates">
+ <op op="-">
+ <fieldref>nInfo</fieldref>
+ <fieldref>nSizes</fieldref>
+ </op>
+ </list>
+ </reply>
+ </request>
+ <enum name="SM">
+ <item name="ScreenChangeNotify">
+ <value>1</value>
+ </item>
+ </enum>
+ <event name="ScreenChangeNotify" number="0">
+ <field type="CARD8" name="rotation"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="TIMESTAMP" name="config_time"/>
+ <field type="WINDOW" name="root"/>
+ <field type="WINDOW" name="request_window"/>
+ <field type="CARD16" name="sizeID"/>
+ <field type="CARD16" name="subpixel_order"/>
+ <field type="ScreenSize"/>
+ </event>
</xcb>
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index 09729ad..b64192a 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -25,148 +25,141 @@ 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">
-
- <!-- Types -->
- <xidtype name="CONTEXT" />
-
- <struct name="Range8">
- <field type="CARD8" name="first" />
- <field type="CARD8" name="last" />
- </struct>
-
- <struct name="Range16">
- <field type="CARD16" name="first" />
- <field type="CARD16" name="last" />
- </struct>
-
- <struct name="ExtRange">
- <field type="Range8" name="major" />
- <field type="Range16" name="minor" />
- </struct>
-
- <struct name="Range">
- <field type="Range8" name="core_requests" />
- <field type="Range8" name="core_replies" />
- <field type="ExtRange" name="ext_requests" />
- <field type="ExtRange" name="ext_replies" />
- <field type="Range8" name="delivered_events" />
- <field type="Range8" name="device_events" />
- <field type="Range8" name="errors" />
- <field type="BOOL" name="client_started" />
- <field type="BOOL" name="client_died" />
- </struct>
-
- <typedef oldname="CARD8" newname="ElementHeader" />
- <enum name="HType">
- <item name="FromServerTime"><value>0x01</value></item>
- <item name="FromClientTime"><value>0x02</value></item>
- <item name="FromClientSequence"><value>0x04</value></item>
- </enum>
-
- <typedef oldname="CARD32" newname="ClientSpec" />
- <enum name="CS">
- <item name="CurrentClients"><value>1</value></item>
- <item name="FutureClients"><value>2</value></item>
- <item name="AllClients"><value>3</value></item>
- </enum>
-
- <struct name="ClientInfo">
- <field type="ClientSpec" name="client_resource" />
- <field type="CARD32" name="num_ranges" />
- <list type="Range" name="ranges">
- <fieldref>num_ranges</fieldref>
- </list>
- </struct>
-
- <!-- Errors -->
- <error name="BadContext" number="0">
- <field type="CARD32" name="invalid_record" />
- </error>
-
- <!-- Requests -->
- <request name="QueryVersion" opcode="0">
- <field type="CARD16" name="major_version" />
- <field type="CARD16" name="minor_version" />
- <reply>
- <pad bytes="1"/>
- <field type="CARD16" name="major_version" />
- <field type="CARD16" name="minor_version" />
- </reply>
- </request>
-
- <request name="CreateContext" opcode="1">
- <field type="record:CONTEXT" name="context" />
- <field type="ElementHeader" name="element_header" />
- <pad bytes="3" />
- <field type="CARD32" name="num_client_specs" />
- <field type="CARD32" name="num_ranges" />
- <list type="ClientSpec" name="client_specs">
- <fieldref>num_client_specs</fieldref>
- </list>
- <list type="Range" name="ranges">
- <fieldref>num_ranges</fieldref>
- </list>
- </request>
-
- <request name="RegisterClients" opcode="2">
- <field type="record:CONTEXT" name="context" />
- <field type="ElementHeader" name="element_header" />
- <pad bytes="3" />
- <field type="CARD32" name="num_client_specs" />
- <field type="CARD32" name="num_ranges" />
- <list type="ClientSpec" name="client_specs">
- <fieldref>num_client_specs</fieldref>
- </list>
- <list type="Range" name="ranges">
- <fieldref>num_ranges</fieldref>
- </list>
- </request>
-
- <request name="UnregisterClients" opcode="3">
- <field type="record:CONTEXT" name="context" />
- <field type="CARD32" name="num_client_specs" />
- <list type="ClientSpec" name="client_specs">
- <fieldref>num_client_specs</fieldref>
- </list>
- </request>
-
- <request name="GetContext" opcode="4">
- <field type="record:CONTEXT" name="context" />
- <reply>
- <field type="BOOL" name="enabled" />
- <field type="ElementHeader" name="element_header" />
- <pad bytes="3" />
- <field type="CARD32" name="num_intercepted_clients" />
- <pad bytes="16" />
- <list type="ClientInfo" name="intercepted_clients">
- <fieldref>num_intercepted_clients</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="EnableContext" opcode="5">
- <field type="record:CONTEXT" name="context" />
- <reply>
- <field type="CARD8" name="category" />
- <field type="ElementHeader" name="element_header" />
- <field type="BOOL" name="client_swapped" />
- <pad bytes="2" />
- <field type="CARD32" name="xid_base" />
- <field type="CARD32" name="server_time" />
- <field type="CARD32" name="rec_sequence_num" />
- <pad bytes="8" />
- <list type="BYTE" name="data" />
- </reply>
- </request>
-
- <request name="DisableContext" opcode="6">
- <field type="record:CONTEXT" name="context" />
- </request>
-
- <request name="FreeContext" opcode="7">
- <field type="record:CONTEXT" name="context" />
- </request>
-
+<!-- Types -->
+ <xidtype name="CONTEXT"/>
+ <struct name="Range8">
+ <field type="CARD8" name="first"/>
+ <field type="CARD8" name="last"/>
+ </struct>
+ <struct name="Range16">
+ <field type="CARD16" name="first"/>
+ <field type="CARD16" name="last"/>
+ </struct>
+ <struct name="ExtRange">
+ <field type="Range8" name="major"/>
+ <field type="Range16" name="minor"/>
+ </struct>
+ <struct name="Range">
+ <field type="Range8" name="core_requests"/>
+ <field type="Range8" name="core_replies"/>
+ <field type="ExtRange" name="ext_requests"/>
+ <field type="ExtRange" name="ext_replies"/>
+ <field type="Range8" name="delivered_events"/>
+ <field type="Range8" name="device_events"/>
+ <field type="Range8" name="errors"/>
+ <field type="BOOL" name="client_started"/>
+ <field type="BOOL" name="client_died"/>
+ </struct>
+ <typedef oldname="CARD8" newname="ElementHeader"/>
+ <enum name="HType">
+ <item name="FromServerTime">
+ <value>0x01</value>
+ </item>
+ <item name="FromClientTime">
+ <value>0x02</value>
+ </item>
+ <item name="FromClientSequence">
+ <value>0x04</value>
+ </item>
+ </enum>
+ <typedef oldname="CARD32" newname="ClientSpec"/>
+ <enum name="CS">
+ <item name="CurrentClients">
+ <value>1</value>
+ </item>
+ <item name="FutureClients">
+ <value>2</value>
+ </item>
+ <item name="AllClients">
+ <value>3</value>
+ </item>
+ </enum>
+ <struct name="ClientInfo">
+ <field type="ClientSpec" name="client_resource"/>
+ <field type="CARD32" name="num_ranges"/>
+ <list type="Range" name="ranges">
+ <fieldref>num_ranges</fieldref>
+ </list>
+ </struct>
+<!-- Errors -->
+ <error name="BadContext" number="0">
+ <field type="CARD32" name="invalid_record"/>
+ </error>
+<!-- Requests -->
+ <request name="QueryVersion" opcode="0">
+ <field type="CARD16" name="major_version"/>
+ <field type="CARD16" name="minor_version"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="major_version"/>
+ <field type="CARD16" name="minor_version"/>
+ </reply>
+ </request>
+ <request name="CreateContext" opcode="1">
+ <field type="record:CONTEXT" name="context"/>
+ <field type="ElementHeader" name="element_header"/>
+ <pad bytes="3"/>
+ <field type="CARD32" name="num_client_specs"/>
+ <field type="CARD32" name="num_ranges"/>
+ <list type="ClientSpec" name="client_specs">
+ <fieldref>num_client_specs</fieldref>
+ </list>
+ <list type="Range" name="ranges">
+ <fieldref>num_ranges</fieldref>
+ </list>
+ </request>
+ <request name="RegisterClients" opcode="2">
+ <field type="record:CONTEXT" name="context"/>
+ <field type="ElementHeader" name="element_header"/>
+ <pad bytes="3"/>
+ <field type="CARD32" name="num_client_specs"/>
+ <field type="CARD32" name="num_ranges"/>
+ <list type="ClientSpec" name="client_specs">
+ <fieldref>num_client_specs</fieldref>
+ </list>
+ <list type="Range" name="ranges">
+ <fieldref>num_ranges</fieldref>
+ </list>
+ </request>
+ <request name="UnregisterClients" opcode="3">
+ <field type="record:CONTEXT" name="context"/>
+ <field type="CARD32" name="num_client_specs"/>
+ <list type="ClientSpec" name="client_specs">
+ <fieldref>num_client_specs</fieldref>
+ </list>
+ </request>
+ <request name="GetContext" opcode="4">
+ <field type="record:CONTEXT" name="context"/>
+ <reply>
+ <field type="BOOL" name="enabled"/>
+ <field type="ElementHeader" name="element_header"/>
+ <pad bytes="3"/>
+ <field type="CARD32" name="num_intercepted_clients"/>
+ <pad bytes="16"/>
+ <list type="ClientInfo" name="intercepted_clients">
+ <fieldref>num_intercepted_clients</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="EnableContext" opcode="5">
+ <field type="record:CONTEXT" name="context"/>
+ <reply>
+ <field type="CARD8" name="category"/>
+ <field type="ElementHeader" name="element_header"/>
+ <field type="BOOL" name="client_swapped"/>
+ <pad bytes="2"/>
+ <field type="CARD32" name="xid_base"/>
+ <field type="CARD32" name="server_time"/>
+ <field type="CARD32" name="rec_sequence_num"/>
+ <pad bytes="8"/>
+ <list type="BYTE" name="data"/>
+ </reply>
+ </request>
+ <request name="DisableContext" opcode="6">
+ <field type="record:CONTEXT" name="context"/>
+ </request>
+ <request name="FreeContext" opcode="7">
+ <field type="record:CONTEXT" name="context"/>
+ </request>
</xcb>
diff --git a/xcb-proto/src/extensions/render.xml b/xcb-proto/src/extensions/render.xml
index 74938be..18e7499 100644
--- a/xcb-proto/src/extensions/render.xml
+++ b/xcb-proto/src/extensions/render.xml
@@ -5,243 +5,260 @@ 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.8 -->
<enum name="PictType">
- <item name="Indexed" />
- <item name="Direct" />
+ <item name="Indexed"/>
+ <item name="Direct"/>
</enum>
-
- <!-- Disjoint* and Conjoint* are new in version 0.2 -->
+<!-- Disjoint* and Conjoint* are new in version 0.2 -->
<enum name="PictOp">
- <item name="Clear" />
- <item name="Src" />
- <item name="Dst" />
- <item name="Over" />
- <item name="OverReverse" />
- <item name="In" />
- <item name="InReverse" />
- <item name="Out" />
- <item name="OutReverse" />
- <item name="Atop" />
- <item name="AtopReverse" />
- <item name="Xor" />
- <item name="Add" />
- <item name="Saturate" />
-
- <item name="DisjointClear"><value>0x10</value></item>
- <item name="DisjointSrc" />
- <item name="DisjointDst" />
- <item name="DisjointOver" />
- <item name="DisjointOverReverse" />
- <item name="DisjointIn" />
- <item name="DisjointInReverse" />
- <item name="DisjointOut" />
- <item name="DisjointOutReverse" />
- <item name="DisjointAtop" />
- <item name="DisjointAtopReverse" />
- <item name="DisjointXor" />
-
- <item name="ConjointClear"><value>0x20</value></item>
- <item name="ConjointSrc" />
- <item name="ConjointDst" />
- <item name="ConjointOver" />
- <item name="ConjointOverReverse" />
- <item name="ConjointIn" />
- <item name="ConjointInReverse" />
- <item name="ConjointOut" />
- <item name="ConjointOutReverse" />
- <item name="ConjointAtop" />
- <item name="ConjointAtopReverse" />
- <item name="ConjointXor" />
+ <item name="Clear"/>
+ <item name="Src"/>
+ <item name="Dst"/>
+ <item name="Over"/>
+ <item name="OverReverse"/>
+ <item name="In"/>
+ <item name="InReverse"/>
+ <item name="Out"/>
+ <item name="OutReverse"/>
+ <item name="Atop"/>
+ <item name="AtopReverse"/>
+ <item name="Xor"/>
+ <item name="Add"/>
+ <item name="Saturate"/>
+ <item name="DisjointClear">
+ <value>0x10</value>
+ </item>
+ <item name="DisjointSrc"/>
+ <item name="DisjointDst"/>
+ <item name="DisjointOver"/>
+ <item name="DisjointOverReverse"/>
+ <item name="DisjointIn"/>
+ <item name="DisjointInReverse"/>
+ <item name="DisjointOut"/>
+ <item name="DisjointOutReverse"/>
+ <item name="DisjointAtop"/>
+ <item name="DisjointAtopReverse"/>
+ <item name="DisjointXor"/>
+ <item name="ConjointClear">
+ <value>0x20</value>
+ </item>
+ <item name="ConjointSrc"/>
+ <item name="ConjointDst"/>
+ <item name="ConjointOver"/>
+ <item name="ConjointOverReverse"/>
+ <item name="ConjointIn"/>
+ <item name="ConjointInReverse"/>
+ <item name="ConjointOut"/>
+ <item name="ConjointOutReverse"/>
+ <item name="ConjointAtop"/>
+ <item name="ConjointAtopReverse"/>
+ <item name="ConjointXor"/>
</enum>
-
<enum name="PolyEdge">
- <item name="Sharp" />
- <item name="Smooth" />
+ <item name="Sharp"/>
+ <item name="Smooth"/>
</enum>
-
<enum name="PolyMode">
- <item name="Precise" />
- <item name="Imprecise" />
+ <item name="Precise"/>
+ <item name="Imprecise"/>
</enum>
-
<enum name="CP">
<item name="Repeat">
- <op op="<<"><value>1</value><value>0</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>0</value>
+ </op>
</item>
<item name="AlphaMap">
- <op op="<<"><value>1</value><value>1</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>1</value>
+ </op>
</item>
<item name="AlphaXOrigin">
- <op op="<<"><value>1</value><value>2</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>2</value>
+ </op>
</item>
<item name="AlphaYOrigin">
- <op op="<<"><value>1</value><value>3</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>3</value>
+ </op>
</item>
<item name="ClipXOrigin">
- <op op="<<"><value>1</value><value>4</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>4</value>
+ </op>
</item>
<item name="ClipYOrigin">
- <op op="<<"><value>1</value><value>5</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>5</value>
+ </op>
</item>
<item name="ClipMask">
- <op op="<<"><value>1</value><value>6</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>6</value>
+ </op>
</item>
<item name="GraphicsExposure">
- <op op="<<"><value>1</value><value>7</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>7</value>
+ </op>
</item>
<item name="SubwindowMode">
- <op op="<<"><value>1</value><value>8</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>8</value>
+ </op>
</item>
<item name="PolyEdge">
- <op op="<<"><value>1</value><value>9</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>9</value>
+ </op>
</item>
<item name="PolyMode">
- <op op="<<"><value>1</value><value>10</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>10</value>
+ </op>
</item>
<item name="Dither">
- <op op="<<"><value>1</value><value>11</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>11</value>
+ </op>
</item>
<item name="ComponentAlpha">
- <op op="<<"><value>1</value><value>12</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>12</value>
+ </op>
</item>
</enum>
-
<enum name="SubPixel">
- <item name="Unknown" />
- <item name="HorizontalRGB" />
- <item name="HorizontalBGR" />
- <item name="VerticalRGB" />
- <item name="VerticalBGR" />
- <item name="None" />
+ <item name="Unknown"/>
+ <item name="HorizontalRGB"/>
+ <item name="HorizontalBGR"/>
+ <item name="VerticalRGB"/>
+ <item name="VerticalBGR"/>
+ <item name="None"/>
</enum>
-
- <typedef oldname="CARD32" newname="GLYPH" />
- <xidtype name="GLYPHSET" />
-
- <xidtype name="PICTURE" />
- <xidtype name="PICTFORMAT" />
-
- <typedef oldname="INT32" newname="FIXED" />
-
- <error name="PictFormat" number="0" />
- <error name="Picture" number="1" />
- <error name="PictOp" number="2" />
- <error name="GlyphSet" number="3" />
- <error name="Glyph" number="4" />
-
+ <typedef oldname="CARD32" newname="GLYPH"/>
+ <xidtype name="GLYPHSET"/>
+ <xidtype name="PICTURE"/>
+ <xidtype name="PICTFORMAT"/>
+ <typedef oldname="INT32" newname="FIXED"/>
+ <error name="PictFormat" number="0"/>
+ <error name="Picture" number="1"/>
+ <error name="PictOp" number="2"/>
+ <error name="GlyphSet" number="3"/>
+ <error name="Glyph" number="4"/>
<struct name="DIRECTFORMAT">
- <field type="CARD16" name="red_shift" />
- <field type="CARD16" name="red_mask" />
- <field type="CARD16" name="green_shift" />
- <field type="CARD16" name="green_mask" />
- <field type="CARD16" name="blue_shift" />
- <field type="CARD16" name="blue_mask" />
- <field type="CARD16" name="alpha_shift" />
- <field type="CARD16" name="alpha_mask" />
+ <field type="CARD16" name="red_shift"/>
+ <field type="CARD16" name="red_mask"/>
+ <field type="CARD16" name="green_shift"/>
+ <field type="CARD16" name="green_mask"/>
+ <field type="CARD16" name="blue_shift"/>
+ <field type="CARD16" name="blue_mask"/>
+ <field type="CARD16" name="alpha_shift"/>
+ <field type="CARD16" name="alpha_mask"/>
</struct>
-
<struct name="PICTFORMINFO">
- <field type="PICTFORMAT" name="id" />
- <field type="CARD8" name="type" />
- <field type="CARD8" name="depth" />
- <pad bytes="2" />
- <field type="DIRECTFORMAT" name="direct" />
- <field type="COLORMAP" name="colormap" />
+ <field type="PICTFORMAT" name="id"/>
+ <field type="CARD8" name="type"/>
+ <field type="CARD8" name="depth"/>
+ <pad bytes="2"/>
+ <field type="DIRECTFORMAT" name="direct"/>
+ <field type="COLORMAP" name="colormap"/>
</struct>
-
<struct name="PICTVISUAL">
- <field type="VISUALID" name="visual" />
- <field type="PICTFORMAT" name="format" />
+ <field type="VISUALID" name="visual"/>
+ <field type="PICTFORMAT" name="format"/>
</struct>
-
<struct name="PICTDEPTH">
- <field type="CARD8" name="depth" />
- <pad bytes="1" />
- <field type="CARD16" name="num_visuals" />
- <pad bytes="4" />
+ <field type="CARD8" name="depth"/>
+ <pad bytes="1"/>
+ <field type="CARD16" name="num_visuals"/>
+ <pad bytes="4"/>
<list type="PICTVISUAL" name="visuals">
<fieldref>num_visuals</fieldref>
</list>
</struct>
-
<struct name="PICTSCREEN">
- <field type="CARD32" name="num_depths" />
- <field type="PICTFORMAT" name="fallback" />
+ <field type="CARD32" name="num_depths"/>
+ <field type="PICTFORMAT" name="fallback"/>
<list type="PICTDEPTH" name="depths">
<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" />
+ <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" />
+ <field type="CARD16" name="red"/>
+ <field type="CARD16" name="green"/>
+ <field type="CARD16" name="blue"/>
+ <field type="CARD16" name="alpha"/>
</struct>
-
<struct name="POINTFIX">
- <field type="FIXED" name="x" />
- <field type="FIXED" name="y" />
+ <field type="FIXED" name="x"/>
+ <field type="FIXED" name="y"/>
</struct>
-
<struct name="LINEFIX">
- <field type="POINTFIX" name="p1" />
- <field type="POINTFIX" name="p2" />
+ <field type="POINTFIX" name="p1"/>
+ <field type="POINTFIX" name="p2"/>
</struct>
-
<struct name="TRIANGLE">
- <field type="POINTFIX" name="p1" />
- <field type="POINTFIX" name="p2" />
- <field type="POINTFIX" name="p3" />
+ <field type="POINTFIX" name="p1"/>
+ <field type="POINTFIX" name="p2"/>
+ <field type="POINTFIX" name="p3"/>
</struct>
-
<struct name="TRAP">
- <field type="FIXED" name="top" />
- <field type="FIXED" name="bottom" />
- <field type="LINEFIX" name="left" />
- <field type="LINEFIX" name="right" />
+ <field type="FIXED" name="top"/>
+ <field type="FIXED" name="bottom"/>
+ <field type="LINEFIX" name="left"/>
+ <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="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"/>
</struct>
-
-
<request name="QueryVersion" opcode="0">
- <field type="CARD32" name="client_major_version" />
- <field type="CARD32" name="client_minor_version" />
+ <field type="CARD32" name="client_major_version"/>
+ <field type="CARD32" name="client_minor_version"/>
<reply>
- <pad bytes="1" />
- <field type="CARD32" name="major_version" />
- <field type="CARD32" name="minor_version" />
- <pad bytes="16" />
+ <pad bytes="1"/>
+ <field type="CARD32" name="major_version"/>
+ <field type="CARD32" name="minor_version"/>
+ <pad bytes="16"/>
</reply>
</request>
-
<request name="QueryPictFormats" opcode="1">
<reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_formats" />
- <field type="CARD32" name="num_screens" />
- <field type="CARD32" name="num_depths" />
- <field type="CARD32" name="num_visuals" />
- <field type="CARD32" name="num_subpixel" /> <!-- new in version 0.6 -->
- <pad bytes="4" />
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_formats"/>
+ <field type="CARD32" name="num_screens"/>
+ <field type="CARD32" name="num_depths"/>
+ <field type="CARD32" name="num_visuals"/>
+ <field type="CARD32" name="num_subpixel"/>
+<!-- new in version 0.6 -->
+ <pad bytes="4"/>
<list type="PICTFORMINFO" name="formats">
<fieldref>num_formats</fieldref>
</list>
@@ -253,290 +270,244 @@ for licensing information.
</list>
</reply>
</request>
-
- <!-- from version 0.7 -->
+<!-- from version 0.7 -->
<request name="QueryPictIndexValues" opcode="2">
- <field type="PICTFORMAT" name="format" />
+ <field type="PICTFORMAT" name="format"/>
<reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_values" />
- <pad bytes="20" />
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_values"/>
+ <pad bytes="20"/>
<list type="INDEXVALUE" name="values">
<fieldref>num_values</fieldref>
</list>
</reply>
</request>
-
- <!-- opcode 3 reserved for QueryDithers -->
-
+<!-- opcode 3 reserved for QueryDithers -->
<request name="CreatePicture" opcode="4">
- <field type="PICTURE" name="pid" />
- <field type="DRAWABLE" name="drawable" />
- <field type="PICTFORMAT" name="format" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <field type="PICTURE" name="pid"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="PICTFORMAT" name="format"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
-
<request name="ChangePicture" opcode="5">
- <field type="PICTURE" name="picture" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <field type="PICTURE" name="picture"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
-
<request name="SetPictureClipRectangles" opcode="6">
- <field type="PICTURE" name="picture" />
- <field type="INT16" name="clip_x_origin" />
- <field type="INT16" name="clip_y_origin" />
- <list type="RECTANGLE" name="rectangles" />
+ <field type="PICTURE" name="picture"/>
+ <field type="INT16" name="clip_x_origin"/>
+ <field type="INT16" name="clip_y_origin"/>
+ <list type="RECTANGLE" name="rectangles"/>
</request>
-
<request name="FreePicture" opcode="7">
- <field type="PICTURE" name="picture" />
+ <field type="PICTURE" name="picture"/>
</request>
-
<request name="Composite" opcode="8">
- <field type="CARD8" name="op" />
- <pad bytes="3" />
- <field type="PICTURE" name="src" />
- <field type="PICTURE" name="mask" />
- <field type="PICTURE" name="dst" />
- <field type="INT16" name="src_x" />
- <field type="INT16" name="src_y" />
- <field type="INT16" name="mask_x" />
- <field type="INT16" name="mask_y" />
- <field type="INT16" name="dst_x" />
- <field type="INT16" name="dst_y" />
- <field type="CARD16" name="width" />
- <field type="CARD16" name="height" />
- </request>
-
- <!-- opcode 9 reserved for Scale -->
-
+ <field type="CARD8" name="op"/>
+ <pad bytes="3"/>
+ <field type="PICTURE" name="src"/>
+ <field type="PICTURE" name="mask"/>
+ <field type="PICTURE" name="dst"/>
+ <field type="INT16" name="src_x"/>
+ <field type="INT16" name="src_y"/>
+ <field type="INT16" name="mask_x"/>
+ <field type="INT16" name="mask_y"/>
+ <field type="INT16" name="dst_x"/>
+ <field type="INT16" name="dst_y"/>
+ <field type="CARD16" name="width"/>
+ <field type="CARD16" name="height"/>
+ </request>
+<!-- opcode 9 reserved for Scale -->
<request name="Trapezoids" opcode="10">
- <field type="CARD8" name="op" />
- <pad bytes="3" />
- <field type="PICTURE" name="src" />
- <field type="PICTURE" name="dst" />
- <field type="PICTFORMAT" name="mask_format" />
- <field type="INT16" name="src_x" />
- <field type="INT16" name="src_y" />
- <list type="TRAP" name="traps" />
+ <field type="CARD8" name="op"/>
+ <pad bytes="3"/>
+ <field type="PICTURE" name="src"/>
+ <field type="PICTURE" name="dst"/>
+ <field type="PICTFORMAT" name="mask_format"/>
+ <field type="INT16" name="src_x"/>
+ <field type="INT16" name="src_y"/>
+ <list type="TRAP" name="traps"/>
</request>
-
<request name="Triangles" opcode="11">
- <field type="CARD8" name="op" />
- <pad bytes="3" />
- <field type="PICTURE" name="src" />
- <field type="PICTURE" name="dst" />
- <field type="PICTFORMAT" name="mask_format" />
- <field type="INT16" name="src_x" />
- <field type="INT16" name="src_y" />
- <list type="TRIANGLE" name="triangles" />
+ <field type="CARD8" name="op"/>
+ <pad bytes="3"/>
+ <field type="PICTURE" name="src"/>
+ <field type="PICTURE" name="dst"/>
+ <field type="PICTFORMAT" name="mask_format"/>
+ <field type="INT16" name="src_x"/>
+ <field type="INT16" name="src_y"/>
+ <list type="TRIANGLE" name="triangles"/>
</request>
-
<request name="TriStrip" opcode="12">
- <field type="CARD8" name="op" />
- <pad bytes="3" />
- <field type="PICTURE" name="src" />
- <field type="PICTURE" name="dst" />
- <field type="PICTFORMAT" name="mask_format" />
- <field type="INT16" name="src_x" />
- <field type="INT16" name="src_y" />
- <list type="POINTFIX" name="points" />
+ <field type="CARD8" name="op"/>
+ <pad bytes="3"/>
+ <field type="PICTURE" name="src"/>
+ <field type="PICTURE" name="dst"/>
+ <field type="PICTFORMAT" name="mask_format"/>
+ <field type="INT16" name="src_x"/>
+ <field type="INT16" name="src_y"/>
+ <list type="POINTFIX" name="points"/>
</request>
-
<request name="TriFan" opcode="13">
- <field type="CARD8" name="op" />
- <pad bytes="3" />
- <field type="PICTURE" name="src" />
- <field type="PICTURE" name="dst" />
- <field type="PICTFORMAT" name="mask_format" />
- <field type="INT16" name="src_x" />
- <field type="INT16" name="src_y" />
- <list type="POINTFIX" name="points" />
- </request>
-
- <!-- opcode 14 reserved for ColorTrapezoids -->
-
- <!-- opcode 15 reserved for ColorTriangles -->
-
- <!-- opcode 16 reserved for Transform -->
-
+ <field type="CARD8" name="op"/>
+ <pad bytes="3"/>
+ <field type="PICTURE" name="src"/>
+ <field type="PICTURE" name="dst"/>
+ <field type="PICTFORMAT" name="mask_format"/>
+ <field type="INT16" name="src_x"/>
+ <field type="INT16" name="src_y"/>
+ <list type="POINTFIX" name="points"/>
+ </request>
+<!-- opcode 14 reserved for ColorTrapezoids -->
+<!-- opcode 15 reserved for ColorTriangles -->
+<!-- opcode 16 reserved for Transform -->
<request name="CreateGlyphSet" opcode="17">
- <field type="GLYPHSET" name="gsid" />
- <field type="PICTFORMAT" name="format" />
+ <field type="GLYPHSET" name="gsid"/>
+ <field type="PICTFORMAT" name="format"/>
</request>
-
<request name="ReferenceGlyphSet" opcode="18">
- <field type="GLYPHSET" name="gsid" />
- <field type="GLYPHSET" name="existing" />
+ <field type="GLYPHSET" name="gsid"/>
+ <field type="GLYPHSET" name="existing"/>
</request>
-
<request name="FreeGlyphSet" opcode="19">
- <field type="GLYPHSET" name="glyphset" />
+ <field type="GLYPHSET" name="glyphset"/>
</request>
-
<request name="AddGlyphs" opcode="20">
- <field type="GLYPHSET" name="glyphset" />
- <field type="CARD32" name="glyphs_len" />
+ <field type="GLYPHSET" name="glyphset"/>
+ <field type="CARD32" name="glyphs_len"/>
<list type="CARD32" name="glyphids">
<fieldref>glyphs_len</fieldref>
</list>
<list type="GLYPHINFO" name="glyphs">
<fieldref>glyphs_len</fieldref>
</list>
- <list type="BYTE" name="data" />
+ <list type="BYTE" name="data"/>
</request>
-
- <!-- opcode 21 reserved for AddGlyphsFromPicture -->
-
+<!-- opcode 21 reserved for AddGlyphsFromPicture -->
<request name="FreeGlyphs" opcode="22">
- <field type="GLYPHSET" name="glyphset" />
- <list type="GLYPH" name="glyphs" />
+ <field type="GLYPHSET" name="glyphset"/>
+ <list type="GLYPH" name="glyphs"/>
</request>
-
<struct name="GLYPHSETELT">
- <field type="CARD8" name="len" />
- <pad bytes="3" />
- <field type="INT16" name="deltax" />
- <field type="INT16" name="deltay" />
- <field type="GLYPHSET" name="glyphset" />
- </struct>
-
- <!-- CompositeGlyphs8 -->
-
+ <field type="CARD8" name="len"/>
+ <pad bytes="3"/>
+ <field type="INT16" name="deltax"/>
+ <field type="INT16" name="deltay"/>
+ <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="CARD8" name="len"/>
+ <pad bytes="3"/>
+ <field type="INT16" name="deltax"/>
+ <field type="INT16" name="deltay"/>
<list type="CARD8" name="glyphs">
<fieldref>len</fieldref>
</list>
</struct>
-
<union name="GLYPHITEM8">
- <field type="GLYPHELT8" name="glyphelt" />
- <field type="GLYPHSETELT" name="glyphset" />
+ <field type="GLYPHELT8" name="glyphelt"/>
+ <field type="GLYPHSETELT" name="glyphset"/>
</union>
-
<request name="CompositeGlyphs8" opcode="23">
- <field type="CARD8" name="op" />
- <pad bytes="3" />
- <field type="PICTURE" name="src" />
- <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" />
- <list type="GLYPHITEM8" name="glyphcmds" />
- </request>
-
- <!-- CompositeGlyphs16 -->
-
+ <field type="CARD8" name="op"/>
+ <pad bytes="3"/>
+ <field type="PICTURE" name="src"/>
+ <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"/>
+ <list type="GLYPHITEM8" name="glyphcmds"/>
+ </request>
+<!-- CompositeGlyphs16 -->
<struct name="GLYPHELT16">
- <field type="CARD8" name="len" />
- <pad bytes="3" />
- <field type="INT16" name="deltax" />
- <field type="INT16" name="deltay" />
+ <field type="CARD8" name="len"/>
+ <pad bytes="3"/>
+ <field type="INT16" name="deltax"/>
+ <field type="INT16" name="deltay"/>
<list type="CARD16" name="glyphs">
<fieldref>len</fieldref>
</list>
</struct>
-
<union name="GLYPHITEM16">
- <field type="GLYPHELT16" name="glyphelt" />
- <field type="GLYPHSETELT" name="glyphset" />
+ <field type="GLYPHELT16" name="glyphelt"/>
+ <field type="GLYPHSETELT" name="glyphset"/>
</union>
-
<request name="CompositeGlyphs16" opcode="24">
- <field type="CARD8" name="op" />
- <pad bytes="3" />
- <field type="PICTURE" name="src" />
- <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" />
- <list type="GLYPHITEM16" name="glyphcmds" />
- </request>
-
- <!-- CompositeGlyphs32 -->
-
+ <field type="CARD8" name="op"/>
+ <pad bytes="3"/>
+ <field type="PICTURE" name="src"/>
+ <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"/>
+ <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="CARD8" name="len"/>
+ <pad bytes="3"/>
+ <field type="INT16" name="deltax"/>
+ <field type="INT16" name="deltay"/>
<list type="CARD32" name="glyphs">
<fieldref>len</fieldref>
</list>
</struct>
-
<union name="GLYPHITEM32">
- <field type="GLYPHELT32" name="glyphelt" />
- <field type="GLYPHSETELT" name="glyphset" />
+ <field type="GLYPHELT32" name="glyphelt"/>
+ <field type="GLYPHSETELT" name="glyphset"/>
</union>
-
<request name="CompositeGlyphs32" opcode="25">
- <field type="CARD8" name="op" />
- <pad bytes="3" />
- <field type="PICTURE" name="src" />
- <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" />
- <list type="GLYPHITEM32" name="glyphcmds" />
- </request>
-
- <!-- new in version 0.1 -->
-
+ <field type="CARD8" name="op"/>
+ <pad bytes="3"/>
+ <field type="PICTURE" name="src"/>
+ <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"/>
+ <list type="GLYPHITEM32" name="glyphcmds"/>
+ </request>
+<!-- new in version 0.1 -->
<request name="FillRectangles" opcode="26">
- <field type="CARD8" name="op" />
- <pad bytes="3" />
- <field type="PICTURE" name="dst" />
- <field type="COLOR" name="color" />
- <list type="RECTANGLE" name="rects" />
- </request>
-
- <!-- new in version 0.5 -->
-
+ <field type="CARD8" name="op"/>
+ <pad bytes="3"/>
+ <field type="PICTURE" name="dst"/>
+ <field type="COLOR" name="color"/>
+ <list type="RECTANGLE" name="rects"/>
+ </request>
+<!-- new in version 0.5 -->
<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" />
- </request>
-
- <!-- new in version 0.6 -->
-
+ <field type="CURSOR" name="cid"/>
+ <field type="PICTURE" name="source"/>
+ <field type="CARD16" name="x"/>
+ <field type="CARD16" name="y"/>
+ </request>
+<!-- new in version 0.6 -->
<struct name="TRANSFORM">
- <field type="FIXED" name="matrix11" />
- <field type="FIXED" name="matrix12" />
- <field type="FIXED" name="matrix13" />
- <field type="FIXED" name="matrix21" />
- <field type="FIXED" name="matrix22" />
- <field type="FIXED" name="matrix23" />
- <field type="FIXED" name="matrix31" />
- <field type="FIXED" name="matrix32" />
- <field type="FIXED" name="matrix33" />
+ <field type="FIXED" name="matrix11"/>
+ <field type="FIXED" name="matrix12"/>
+ <field type="FIXED" name="matrix13"/>
+ <field type="FIXED" name="matrix21"/>
+ <field type="FIXED" name="matrix22"/>
+ <field type="FIXED" name="matrix23"/>
+ <field type="FIXED" name="matrix31"/>
+ <field type="FIXED" name="matrix32"/>
+ <field type="FIXED" name="matrix33"/>
</struct>
-
<request name="SetPictureTransform" opcode="28">
- <field type="PICTURE" name="picture" />
- <field type="TRANSFORM" name="transform" />
+ <field type="PICTURE" name="picture"/>
+ <field type="TRANSFORM" name="transform"/>
</request>
-
<request name="QueryFilters" opcode="29">
- <field type="DRAWABLE" name="drawable" />
+ <field type="DRAWABLE" name="drawable"/>
<reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_aliases" />
- <field type="CARD32" name="num_filters" />
- <pad bytes="16" />
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_aliases"/>
+ <field type="CARD32" name="num_filters"/>
+ <pad bytes="16"/>
<list type="CARD16" name="aliases">
<fieldref>num_aliases</fieldref>
</list>
@@ -545,25 +516,21 @@ for licensing information.
</list>
</reply>
</request>
-
<request name="SetPictureFilter" opcode="30">
- <field type="PICTURE" name="picture" />
- <field type="CARD16" name="filter_len" />
+ <field type="PICTURE" name="picture"/>
+ <field type="CARD16" name="filter_len"/>
<list type="char" name="filter">
<fieldref>filter_len</fieldref>
</list>
- <list type="FIXED" name="values" />
+ <list type="FIXED" name="values"/>
</request>
-
- <!-- new in version 0.8 -->
-
+<!-- new in version 0.8 -->
<struct name="ANIMCURSORELT">
- <field type="CURSOR" name="cursor" />
- <field type="CARD32" name="delay" />
+ <field type="CURSOR" name="cursor"/>
+ <field type="CARD32" name="delay"/>
</struct>
-
<request name="CreateAnimCursor" opcode="31">
- <field type="CURSOR" name="cid" />
- <list type="ANIMCURSORELT" name="cursors" />
+ <field type="CURSOR" name="cid"/>
+ <list type="ANIMCURSORELT" name="cursors"/>
</request>
</xcb>
diff --git a/xcb-proto/src/extensions/res.xml b/xcb-proto/src/extensions/res.xml
index eda0cbe..fe09b98 100644
--- a/xcb-proto/src/extensions/res.xml
+++ b/xcb-proto/src/extensions/res.xml
@@ -26,55 +26,50 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<xcb header="res" extension-xname="X-Resource" extension-name="Res">
- <struct name="Client">
- <field type="CARD32" name="resource_base" />
- <field type="CARD32" name="resource_mask" />
- </struct>
-
- <struct name="Type">
- <field type="CARD32" name="resource_type" />
- <field type="CARD32" name="count" />
- </struct>
-
- <request name="QueryVersion" opcode="0">
- <field type="CARD8" name="client_major" />
- <field type="CARD8" name="client_minor" />
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="server_major" />
- <field type="CARD16" name="server_minor" />
- </reply>
- </request>
-
- <request name="QueryClients" opcode="1">
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_clients" />
- <pad bytes="20" />
- <list type="Client" name="clients">
- <fieldref>num_clients</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="QueryClientResources" opcode="2">
- <field type="CARD32" name="xid" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_types" />
- <pad bytes="20" />
- <list type="Type" name="types">
- <fieldref>num_types</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="QueryClientPixmapBytes" opcode="3">
- <field type="CARD32" name="xid" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="bytes" />
- <field type="CARD32" name="bytes_overflow" />
- </reply>
- </request>
+ <struct name="Client">
+ <field type="CARD32" name="resource_base"/>
+ <field type="CARD32" name="resource_mask"/>
+ </struct>
+ <struct name="Type">
+ <field type="CARD32" name="resource_type"/>
+ <field type="CARD32" name="count"/>
+ </struct>
+ <request name="QueryVersion" opcode="0">
+ <field type="CARD8" name="client_major"/>
+ <field type="CARD8" name="client_minor"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="server_major"/>
+ <field type="CARD16" name="server_minor"/>
+ </reply>
+ </request>
+ <request name="QueryClients" opcode="1">
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_clients"/>
+ <pad bytes="20"/>
+ <list type="Client" name="clients">
+ <fieldref>num_clients</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="QueryClientResources" opcode="2">
+ <field type="CARD32" name="xid"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_types"/>
+ <pad bytes="20"/>
+ <list type="Type" name="types">
+ <fieldref>num_types</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="QueryClientPixmapBytes" opcode="3">
+ <field type="CARD32" name="xid"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="bytes"/>
+ <field type="CARD32" name="bytes_overflow"/>
+ </reply>
+ </request>
</xcb>
diff --git a/xcb-proto/src/extensions/screensaver.xml b/xcb-proto/src/extensions/screensaver.xml
index ae3a3fa..6507f0a 100644
--- a/xcb-proto/src/extensions/screensaver.xml
+++ b/xcb-proto/src/extensions/screensaver.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Copyright (C) 2005 Vincent Torri.
@@ -30,38 +31,39 @@ Screen Saver Extension to the X Protocol
Draft Standard Version 1.0
-->
<xcb header="screensaver" extension-xname="SCREENSAVER" extension-name="ScreenSaver">
- <!-- Types -->
-
+<!-- Types -->
<enum name="KIND">
- <item name="Blanked" />
- <item name="Internal" />
- <item name="External" />
+ <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>
+ <op op="<<">
+ <value>1</value>
+ <value>0</value>
+ </op>
</item>
<item name="CycleMask">
- <op op="<<"><value>1</value><value>1</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>1</value>
+ </op>
</item>
</enum>
-
<enum name="STATE">
- <item name="Off" />
- <item name="On" />
- <item name="Cycle" />
- <item name="Disabled" />
+ <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" />
+ <item name="CopyFromParent"/>
+ <item name="InputOutput"/>
+ <item name="InputOnly"/>
</enum>
-
- <!-- Errors -->
- <!-- Requests -->
+<!-- Errors -->
+<!-- Requests -->
<request name="QueryVersion" opcode="0">
<field type="CARD8" name="client_major_version"/>
<field type="CARD8" name="client_minor_version"/>
@@ -73,7 +75,6 @@ Draft Standard Version 1.0
<pad bytes="22"/>
</reply>
</request>
-
<request name="QueryInfo" opcode="1">
<field type="DRAWABLE" name="drawable"/>
<reply>
@@ -81,17 +82,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="CARD16" name="event_mask"/>
<field type="KIND" name="kind"/>
<pad bytes="10"/>
</reply>
</request>
-
<request name="SelectInput" opcode="2">
<field type="DRAWABLE" name="drawable"/>
- <field type="EVENT" name="event_mask" />
+ <field type="EVENT" name="event_mask"/>
</request>
-
<request name="SetAttributes" opcode="3">
<field type="DRAWABLE" name="drawable"/>
<field type="RECTANGLE"/>
@@ -99,17 +98,12 @@ Draft Standard Version 1.0
<field type="CLASS" name="class"/>
<field type="CARD8" name="depth"/>
<field type="VISUALID" name="visual"/>
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
-
<request name="UnsetAttributes" opcode="4">
<field type="DRAWABLE" name="drawable"/>
</request>
-
- <!-- Events -->
-
+<!-- Events -->
<event name="Notify" number="0">
<field type="CARD8" name="code"/>
<field type="STATE" name="state"/>
@@ -121,5 +115,4 @@ Draft Standard Version 1.0
<field type="BOOL" name="forced"/>
<pad bytes="14"/>
</event>
-
</xcb>
diff --git a/xcb-proto/src/extensions/shape.xml b/xcb-proto/src/extensions/shape.xml
index 917388c..9d7c724 100644
--- a/xcb-proto/src/extensions/shape.xml
+++ b/xcb-proto/src/extensions/shape.xml
@@ -26,119 +26,107 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<xcb header="shape" extension-xname="SHAPE" extension-name="Shape">
- <typedef oldname="CARD8" newname="SHAPE_OP" />
- <typedef oldname="CARD8" newname="SHAPE_KIND" />
-
- <!-- Shape attributes of type SHAPE_OP. -->
+ <typedef oldname="CARD8" newname="SHAPE_OP"/>
+ <typedef oldname="CARD8" newname="SHAPE_KIND"/>
+<!-- Shape attributes of type SHAPE_OP. -->
<enum name="SO">
- <item name="Set" />
- <item name="Union" />
- <item name="Intersect" />
- <item name="Substract" />
- <item name="Invert" />
+ <item name="Set"/>
+ <item name="Union"/>
+ <item name="Intersect"/>
+ <item name="Substract"/>
+ <item name="Invert"/>
</enum>
-
- <!-- Shape attributes of type SHAPE_KIND. -->
+<!-- Shape attributes of type SHAPE_KIND. -->
<enum name="SK">
- <item name="Bounding" />
- <item name="Clip" />
+ <item name="Bounding"/>
+ <item name="Clip"/>
</enum>
-
<event name="Notify" number="0">
- <field type="SHAPE_KIND" name="shape_kind" />
- <field type="WINDOW" name="affected_window" />
- <field type="INT16" name="extents_x" />
- <field type="INT16" name="extents_y" />
- <field type="CARD16" name="extents_width" />
- <field type="CARD16" name="extents_height" />
- <field type="TIMESTAMP" name="server_time" />
- <field type="BOOL" name="shaped" />
+ <field type="SHAPE_KIND" name="shape_kind"/>
+ <field type="WINDOW" name="affected_window"/>
+ <field type="INT16" name="extents_x"/>
+ <field type="INT16" name="extents_y"/>
+ <field type="CARD16" name="extents_width"/>
+ <field type="CARD16" name="extents_height"/>
+ <field type="TIMESTAMP" name="server_time"/>
+ <field type="BOOL" name="shaped"/>
</event>
-
<request name="QueryVersion" opcode="0">
<reply>
- <pad bytes="1" />
- <field type="CARD16" name="major_version" />
- <field type="CARD16" name="minor_version" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="major_version"/>
+ <field type="CARD16" name="minor_version"/>
</reply>
</request>
-
<request name="Rectangles" opcode="1">
- <field type="SHAPE_OP" name="operation" />
- <field type="SHAPE_KIND" name="destination_kind" />
- <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" />
- <list type="RECTANGLE" name="rectangles" />
+ <field type="SHAPE_OP" name="operation"/>
+ <field type="SHAPE_KIND" name="destination_kind"/>
+ <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"/>
+ <list type="RECTANGLE" name="rectangles"/>
</request>
-
<request name="Mask" opcode="2">
- <field type="SHAPE_OP" name="operation" />
- <field type="SHAPE_KIND" 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="PIXMAP" name="source_bitmap" />
+ <field type="SHAPE_OP" name="operation"/>
+ <field type="SHAPE_KIND" 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="PIXMAP" name="source_bitmap"/>
</request>
-
<request name="Combine" opcode="3">
- <field type="SHAPE_OP" name="operation" />
- <field type="SHAPE_KIND" name="destination_kind" />
- <field type="SHAPE_KIND" 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="WINDOW" name="source_window" />
+ <field type="SHAPE_OP" name="operation"/>
+ <field type="SHAPE_KIND" name="destination_kind"/>
+ <field type="SHAPE_KIND" 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="WINDOW" name="source_window"/>
</request>
-
<request name="Offset" opcode="4">
- <field type="SHAPE_KIND" 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="SHAPE_KIND" name="destination_kind"/>
+ <pad bytes="3"/>
+ <field type="WINDOW" name="destination_window"/>
+ <field type="INT16" name="x_offset"/>
+ <field type="INT16" name="y_offset"/>
</request>
-
<request name="QueryExtents" opcode="5">
- <field type="WINDOW" name="destination_window" />
+ <field type="WINDOW" name="destination_window"/>
<reply>
- <pad bytes="1" />
- <field type="BOOL" name="bounding_shaped" />
- <field type="BOOL" name="clip_shaped" />
- <pad bytes="2" />
- <field type="INT16" name="bounding_shape_extents_x" />
- <field type="INT16" name="bounding_shape_extents_y" />
- <field type="CARD16" name="bounding_shape_extents_width" />
- <field type="CARD16" name="bounding_shape_extents_height" />
- <field type="INT16" name="clip_shape_extents_x" />
- <field type="INT16" name="clip_shape_extents_y" />
- <field type="CARD16" name="clip_shape_extents_width" />
- <field type="CARD16" name="clip_shape_extents_height" />
+ <pad bytes="1"/>
+ <field type="BOOL" name="bounding_shaped"/>
+ <field type="BOOL" name="clip_shaped"/>
+ <pad bytes="2"/>
+ <field type="INT16" name="bounding_shape_extents_x"/>
+ <field type="INT16" name="bounding_shape_extents_y"/>
+ <field type="CARD16" name="bounding_shape_extents_width"/>
+ <field type="CARD16" name="bounding_shape_extents_height"/>
+ <field type="INT16" name="clip_shape_extents_x"/>
+ <field type="INT16" name="clip_shape_extents_y"/>
+ <field type="CARD16" name="clip_shape_extents_width"/>
+ <field type="CARD16" name="clip_shape_extents_height"/>
</reply>
</request>
-
<request name="SelectInput" opcode="6">
- <field type="WINDOW" name="destination_window" />
- <field type="BOOL" name="enable" />
+ <field type="WINDOW" name="destination_window"/>
+ <field type="BOOL" name="enable"/>
</request>
-
<request name="InputSelected" opcode="7">
- <field type="WINDOW" name="destination_window" />
+ <field type="WINDOW" name="destination_window"/>
<reply>
- <field type="BOOL" name="enabled" />
+ <field type="BOOL" name="enabled"/>
</reply>
</request>
-
<request name="GetRectangles" opcode="8">
- <field type="WINDOW" name="window" />
- <field type="SHAPE_KIND" name="source_kind" />
+ <field type="WINDOW" name="window"/>
+ <field type="SHAPE_KIND" name="source_kind"/>
<reply>
- <field type="BYTE" name="ordering" />
- <field type="CARD32" name="rectangles_len" />
+ <field type="BYTE" name="ordering"/>
+ <field type="CARD32" name="rectangles_len"/>
<list type="RECTANGLE" name="rectangles">
<fieldref>rectangles_len</fieldref>
</list>
diff --git a/xcb-proto/src/extensions/shm.xml b/xcb-proto/src/extensions/shm.xml
index 40336d4..62a74c1 100644
--- a/xcb-proto/src/extensions/shm.xml
+++ b/xcb-proto/src/extensions/shm.xml
@@ -26,80 +26,72 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<xcb header="shm" extension-xname="MIT-SHM" extension-name="Shm">
- <xidtype name="SEG" />
-
+ <xidtype name="SEG"/>
<event name="Completion" number="0">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
- <field type="SEG" name="shmseg" />
- <field type="CARD16" name="minor_event" />
- <field type="BYTE" name="major_event" />
- <pad bytes="1" />
- <field type="CARD32" name="offset" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="SEG" name="shmseg"/>
+ <field type="CARD16" name="minor_event"/>
+ <field type="BYTE" name="major_event"/>
+ <pad bytes="1"/>
+ <field type="CARD32" name="offset"/>
</event>
-
- <errorcopy name="BadSeg" number="0" ref="Value" />
-
+ <errorcopy name="BadSeg" number="0" ref="Value"/>
<request name="QueryVersion" opcode="0">
<reply>
- <field type="BOOL" name="shared_pixmaps" />
- <field type="VERSION" />
- <field type="CARD16" name="uid" />
- <field type="CARD16" name="gid" />
- <field type="CARD8" name="pixmap_format" />
+ <field type="BOOL" name="shared_pixmaps"/>
+ <field type="VERSION"/>
+ <field type="CARD16" name="uid"/>
+ <field type="CARD16" name="gid"/>
+ <field type="CARD8" name="pixmap_format"/>
</reply>
</request>
-
<request name="Attach" opcode="1">
- <field type="SEG" name="shmseg" />
- <field type="CARD32" name="shmid" />
- <field type="BOOL" name="read_only" />
+ <field type="SEG" name="shmseg"/>
+ <field type="CARD32" name="shmid"/>
+ <field type="BOOL" name="read_only"/>
</request>
-
<request name="Detach" opcode="2">
- <field type="SEG" name="shmseg" />
+ <field type="SEG" name="shmseg"/>
</request>
-
<request name="PutImage" opcode="3">
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="SIZE" name="total_size" />
- <field type="CARD16" name="src_x" />
- <field type="CARD16" name="src_y" />
- <field type="CARD16" name="src_width" />
- <field type="CARD16" name="src_height" />
- <field type="INT16" name="dst_x" />
- <field type="INT16" name="dst_y" />
- <field type="CARD8" name="depth" />
- <field type="CARD8" name="format" />
- <field type="CARD8" name="send_event" />
- <pad bytes="1" />
- <field type="SEG" name="shmseg" />
- <field type="CARD32" name="offset" />
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="SIZE" name="total_size"/>
+ <field type="CARD16" name="src_x"/>
+ <field type="CARD16" name="src_y"/>
+ <field type="CARD16" name="src_width"/>
+ <field type="CARD16" name="src_height"/>
+ <field type="INT16" name="dst_x"/>
+ <field type="INT16" name="dst_y"/>
+ <field type="CARD8" name="depth"/>
+ <field type="CARD8" name="format"/>
+ <field type="CARD8" name="send_event"/>
+ <pad bytes="1"/>
+ <field type="SEG" name="shmseg"/>
+ <field type="CARD32" name="offset"/>
</request>
-
<request name="GetImage" opcode="4">
- <field type="DRAWABLE" name="drawable" />
- <field type="RECTANGLE" />
- <field type="CARD32" name="plane_mask" />
- <field type="CARD8" name="format" />
- <pad bytes="3" />
- <field type="SEG" name="shmseg" />
- <field type="CARD32" name="offset" />
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="RECTANGLE"/>
+ <field type="CARD32" name="plane_mask"/>
+ <field type="CARD8" name="format"/>
+ <pad bytes="3"/>
+ <field type="SEG" name="shmseg"/>
+ <field type="CARD32" name="offset"/>
<reply>
- <field type="CARD8" name="depth" />
- <field type="VISUALID" name="visual" />
- <field type="CARD32" name="size" />
+ <field type="CARD8" name="depth"/>
+ <field type="VISUALID" name="visual"/>
+ <field type="CARD32" name="size"/>
</reply>
</request>
-
<request name="CreatePixmap" opcode="5">
- <field type="PIXMAP" name="pid" />
- <field type="DRAWABLE" name="drawable" />
- <field type="SIZE" />
- <field type="CARD8" name="depth" />
- <pad bytes="3" />
- <field type="SEG" name="shmseg" />
- <field type="CARD32" name="offset" />
+ <field type="PIXMAP" name="pid"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="SIZE"/>
+ <field type="CARD8" name="depth"/>
+ <pad bytes="3"/>
+ <field type="SEG" name="shmseg"/>
+ <field type="CARD32" name="offset"/>
</request>
</xcb>
diff --git a/xcb-proto/src/extensions/sync.xml b/xcb-proto/src/extensions/sync.xml
index 4c9e9f5..23f391f 100644
--- a/xcb-proto/src/extensions/sync.xml
+++ b/xcb-proto/src/extensions/sync.xml
@@ -5,173 +5,143 @@ All Rights Reserved. See the file COPYI
for licensing information.
-->
<xcb header="sync" extension-xname="SYNC" extension-name="Sync">
- <xidtype name="ALARM" />
-
+ <xidtype name="ALARM"/>
<enum name="ALARMSTATE">
- <item name="Active" />
- <item name="Inactive" />
- <item name="Destroyed" />
+ <item name="Active"/>
+ <item name="Inactive"/>
+ <item name="Destroyed"/>
</enum>
-
- <xidtype name="COUNTER" />
-
+ <xidtype name="COUNTER"/>
<enum name="TESTTYPE">
- <item name="PositiveTransition" />
- <item name="NegativeTransition" />
- <item name="PositiveComparison" />
- <item name="NegativeComparison" />
+ <item name="PositiveTransition"/>
+ <item name="NegativeTransition"/>
+ <item name="PositiveComparison"/>
+ <item name="NegativeComparison"/>
</enum>
-
<enum name="VALUETYPE">
- <item name="Absolute" />
- <item name="Relative" />
+ <item name="Absolute"/>
+ <item name="Relative"/>
</enum>
-
<struct name="INT64">
- <field type="INT32" name="hi" />
- <field type="CARD32" name="lo" />
+ <field type="INT32" name="hi"/>
+ <field type="CARD32" name="lo"/>
</struct>
-
<struct name="SYSTEMCOUNTER">
- <field type="COUNTER" name="counter" />
- <field type="INT64" name="resolution" />
- <field type="CARD16" name="name_len" />
+ <field type="COUNTER" name="counter"/>
+ <field type="INT64" name="resolution"/>
+ <field type="CARD16" name="name_len"/>
<list type="CARD8" name="name">
<fieldref>name_len</fieldref>
</list>
</struct>
-
<struct name="TRIGGER">
- <field type="COUNTER" name="counter" />
- <field type="VALUETYPE" name="wait_type" />
- <field type="INT64" name="wait_value" />
- <field type="TESTTYPE" name="test_type" />
+ <field type="COUNTER" name="counter"/>
+ <field type="VALUETYPE" name="wait_type"/>
+ <field type="INT64" name="wait_value"/>
+ <field type="TESTTYPE" name="test_type"/>
</struct>
-
<struct name="WAITCONDITION">
- <field type="TRIGGER" name="trigger" />
- <field type="INT64" name="event_threshold" />
+ <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" />
+ <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" />
+ <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" />
- <field type="CARD8" name="major_version" />
- <field type="CARD8" name="minor_version" />
+ <pad bytes="1"/>
+ <field type="CARD8" name="major_version"/>
+ <field type="CARD8" name="minor_version"/>
</reply>
</request>
-
<request name="ListSystemCounters" opcode="1">
<reply>
- <pad bytes="1" />
- <field type="CARD32" name="counters_len" />
- <pad bytes="20" />
+ <pad bytes="1"/>
+ <field type="CARD32" name="counters_len"/>
+ <pad bytes="20"/>
<list type="SYSTEMCOUNTER" name="counters">
<fieldref>counters_len</fieldref>
</list>
</reply>
</request>
-
<request name="CreateCounter" opcode="2">
- <field type="COUNTER" name="id" />
- <field type="INT64" name="initial_value" />
+ <field type="COUNTER" name="id"/>
+ <field type="INT64" name="initial_value"/>
</request>
-
<request name="DestroyCounter" opcode="6">
- <field type="COUNTER" name="counter" />
+ <field type="COUNTER" name="counter"/>
</request>
-
<request name="QueryCounter" opcode="5">
- <field type="COUNTER" name="counter" />
+ <field type="COUNTER" name="counter"/>
<reply>
- <pad bytes="1" />
- <field type="INT64" name="counter_value" />
+ <pad bytes="1"/>
+ <field type="INT64" name="counter_value"/>
</reply>
</request>
-
<request name="Await" opcode="7">
- <list type="WAITCONDITION" name="wait_list" />
+ <list type="WAITCONDITION" name="wait_list"/>
</request>
-
<request name="ChangeCounter" opcode="4">
- <field type="COUNTER" name="counter" />
- <field type="INT64" name="amount" />
+ <field type="COUNTER" name="counter"/>
+ <field type="INT64" name="amount"/>
</request>
-
<request name="SetCounter" opcode="3">
- <field type="COUNTER" name="counter" />
- <field type="INT64" name="value" />
+ <field type="COUNTER" name="counter"/>
+ <field type="INT64" name="value"/>
</request>
-
<request name="CreateAlarm" opcode="8">
- <field type="ALARM" name="id" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <field type="ALARM" name="id"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
-
<request name="ChangeAlarm" opcode="9">
- <field type="ALARM" name="id" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <field type="ALARM" name="id"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
-
<request name="DestroyAlarm" opcode="11">
- <field type="ALARM" name="alarm" />
+ <field type="ALARM" name="alarm"/>
</request>
-
<request name="QueryAlarm" opcode="10">
- <field type="ALARM" name="alarm" />
+ <field type="ALARM" name="alarm"/>
<reply>
- <pad bytes="1" />
- <field type="TRIGGER" name="trigger" />
- <field type="INT64" name="delta" />
- <field type="BOOL" name="events" />
- <field type="ALARMSTATE" name="state" />
+ <pad bytes="1"/>
+ <field type="TRIGGER" name="trigger"/>
+ <field type="INT64" name="delta"/>
+ <field type="BOOL" name="events"/>
+ <field type="ALARMSTATE" name="state"/>
</reply>
</request>
-
<request name="SetPriority" opcode="12">
- <field type="CARD32" name="id" />
- <field type="INT32" name="priority" />
+ <field type="CARD32" name="id"/>
+ <field type="INT32" name="priority"/>
</request>
-
<request name="GetPriority" opcode="13">
- <field type="CARD32" name="id" />
+ <field type="CARD32" name="id"/>
<reply>
- <pad bytes="1" />
- <field type="INT32" name="priority" />
+ <pad bytes="1"/>
+ <field type="INT32" name="priority"/>
</reply>
</request>
-
<event name="CounterNotify" number="0">
- <field type="CARD8" name="kind" />
- <field type="COUNTER" name="counter" />
- <field type="INT64" name="wait_value" />
- <field type="INT64" name="counter_value" />
- <field type="TIMESTAMP" name="timestamp" />
- <field type="CARD16" name="count" />
- <field type="BOOL" name="destroyed" />
+ <field type="CARD8" name="kind"/>
+ <field type="COUNTER" name="counter"/>
+ <field type="INT64" name="wait_value"/>
+ <field type="INT64" name="counter_value"/>
+ <field type="TIMESTAMP" name="timestamp"/>
+ <field type="CARD16" name="count"/>
+ <field type="BOOL" name="destroyed"/>
</event>
-
<event name="AlarmNotify" number="1">
- <field type="CARD8" name="kind" />
- <field type="ALARM" name="alarm" />
- <field type="INT64" name="counter_value" />
- <field type="INT64" name="alarm_value" />
- <field type="TIMESTAMP" name="timestamp" />
+ <field type="CARD8" name="kind"/>
+ <field type="ALARM" name="alarm"/>
+ <field type="INT64" name="counter_value"/>
+ <field type="INT64" name="alarm_value"/>
+ <field type="TIMESTAMP" name="timestamp"/>
</event>
</xcb>
diff --git a/xcb-proto/src/extensions/xc_misc.xml b/xcb-proto/src/extensions/xc_misc.xml
index 5eb0591..0af8de8 100644
--- a/xcb-proto/src/extensions/xc_misc.xml
+++ b/xcb-proto/src/extensions/xc_misc.xml
@@ -6,29 +6,27 @@ for licensing information.
-->
<xcb header="xc_misc" extension-xname="XC-MISC" extension-name="XCMisc">
<request name="GetVersion" opcode="0">
- <field type="CARD16" name="client_major_version" />
- <field type="CARD16" name="client_minor_version" />
+ <field type="CARD16" name="client_major_version"/>
+ <field type="CARD16" name="client_minor_version"/>
<reply>
- <pad bytes="1" />
- <field type="CARD16" name="server_major_version" />
- <field type="CARD16" name="server_minor_version" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="server_major_version"/>
+ <field type="CARD16" name="server_minor_version"/>
</reply>
</request>
-
<request name="GetXIDRange" opcode="1">
<reply>
- <pad bytes="1" />
- <field type="XID" name="start_id" />
- <field type="CARD32" name="count" />
+ <pad bytes="1"/>
+ <field type="XID" name="start_id"/>
+ <field type="CARD32" name="count"/>
</reply>
</request>
-
<request name="GetXIDList" opcode="2">
- <field type="CARD32" name="count" />
+ <field type="CARD32" name="count"/>
<reply>
- <pad bytes="1" />
- <field type="CARD32" name="ids_len" />
- <pad bytes="20" />
+ <pad bytes="1"/>
+ <field type="CARD32" name="ids_len"/>
+ <pad bytes="20"/>
<list type="XID" name="ids">
<fieldref>ids_len</fieldref>
</list>
diff --git a/xcb-proto/src/extensions/xevie.xml b/xcb-proto/src/extensions/xevie.xml
index 1e5851f..ae69a57 100644
--- a/xcb-proto/src/extensions/xevie.xml
+++ b/xcb-proto/src/extensions/xevie.xml
@@ -27,58 +27,53 @@ authorization from the authors.
<!-- This file describes version 1 of XEVIE. -->
<xcb header="xevie" extension-xname="XEVIE" extension-name="Xevie">
<request name="QueryVersion" opcode="0">
- <field type="CARD16" name="client_major_version" />
- <field type="CARD16" name="client_minor_version" />
+ <field type="CARD16" name="client_major_version"/>
+ <field type="CARD16" name="client_minor_version"/>
<reply>
- <pad bytes="1" />
- <field type="CARD16" name="server_major_version" />
- <field type="CARD16" name="server_minor_version" />
- <pad bytes="20" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="server_major_version"/>
+ <field type="CARD16" name="server_minor_version"/>
+ <pad bytes="20"/>
</reply>
</request>
-
<request name="Start" opcode="1">
- <field type="CARD32" name="screen" />
+ <field type="CARD32" name="screen"/>
<reply>
- <pad bytes="1" />
- <pad bytes="24" />
+ <pad bytes="1"/>
+ <pad bytes="24"/>
</reply>
</request>
-
<request name="End" opcode="2">
- <field type="CARD32" name="cmap" />
+ <field type="CARD32" name="cmap"/>
<reply>
- <pad bytes="1" />
- <pad bytes="24" />
+ <pad bytes="1"/>
+ <pad bytes="24"/>
</reply>
</request>
-
<enum name="Datatype">
- <item name="Unmodified" />
- <item name="Modified" />
+ <item name="Unmodified"/>
+ <item name="Modified"/>
</enum>
-
- <!-- The Send request needs to send an arbitrary Event; this type is used
+<!-- The Send request needs to send an arbitrary Event; this type is used
to reserve the necessary structure size. -->
<struct name="Event">
- <pad bytes="32" />
+ <pad bytes="32"/>
</struct>
-
<request name="Send" opcode="3">
- <field type="Event" name="event" />
- <field type="CARD32" name="data_type" /> <!-- Datatype -->
- <pad bytes="64" />
+ <field type="Event" name="event"/>
+<!-- Datatype -->
+ <field type="CARD32" name="data_type"/>
+ <pad bytes="64"/>
<reply>
- <pad bytes="1" />
- <pad bytes="24" />
+ <pad bytes="1"/>
+ <pad bytes="24"/>
</reply>
</request>
-
<request name="SelectInput" opcode="4">
- <field type="CARD32" name="event_mask" />
+ <field type="CARD32" name="event_mask"/>
<reply>
- <pad bytes="1" />
- <pad bytes="24" />
+ <pad bytes="1"/>
+ <pad bytes="24"/>
</reply>
</request>
</xcb>
diff --git a/xcb-proto/src/extensions/xf86dri.xml b/xcb-proto/src/extensions/xf86dri.xml
index bb37ca7..e17d6ed 100644
--- a/xcb-proto/src/extensions/xf86dri.xml
+++ b/xcb-proto/src/extensions/xf86dri.xml
@@ -25,144 +25,128 @@ 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">
-
- <!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->
-
- <!-- Types -->
-
- <struct name="DrmClipRect">
- <field type="INT16" name="x1" />
- <field type="INT16" name="y1" />
- <field type="INT16" name="x2" />
- <field type="INT16" name="x3" />
- </struct>
-
- <!-- Requests -->
- <request name="QueryVersion" opcode="0">
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="dri_major_version" />
- <field type="CARD16" name="dri_minor_version" />
- <field type="CARD32" name="dri_minor_patch" />
- </reply>
- </request>
-
- <request name="QueryDirectRenderingCapable" opcode="1">
- <field type="CARD32" name="screen" />
- <reply>
- <pad bytes="1" />
- <field type="BOOL" name="is_capable" />
- </reply>
- </request>
-
- <request name="OpenConnection" opcode="2">
- <field type="CARD32" name="screen" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="drm_client_key_low" />
- <field type="CARD32" name="drm_client_key_high" />
- <field type="CARD32" name="sarea_handle_low" />
- <field type="CARD32" name="sarea_handle_high" />
- <field type="CARD32" name="bus_id_len" />
- <pad bytes="12" />
- <list type="CARD8" name="bus_id">
- <fieldref>bus_id_len</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="CloseConnection" opcode="3">
- <field type="CARD32" name="screen" />
- </request>
-
- <request name="GetClientDriverName" opcode="4">
- <field type="CARD32" name="screen" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="client_driver_major_version" />
- <field type="CARD32" name="client_driver_minor_version" />
- <field type="CARD32" name="client_driver_patch_version" />
- <field type="CARD32" name="client_driver_name_len" />
- <pad bytes="8" />
- <list type="CARD8" name="client_driver_name">
- <fieldref>client_driver_name_len</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="CreateContext" opcode="5">
- <field type="CARD32" name="visual" />
- <field type="CARD32" name="screen" />
- <field type="CARD32" name="context" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="hw_context" />
- </reply>
- </request>
-
- <request name="DestroyContext" opcode="6">
- <field type="CARD32" name="screen" />
- <field type="CARD32" name="context" />
- </request>
-
- <request name="CreateDrawable" opcode="7">
- <field type="CARD32" name="screen" />
- <field type="CARD32" name="drawable" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="hw_drawable_handle" />
- </reply>
- </request>
-
- <request name="DestroyDrawable" opcode="8">
- <field type="CARD32" name="screen" />
- <field type="CARD32" name="drawable" />
- </request>
-
- <request name="GetDrawableInfo" opcode="9">
- <field type="CARD32" name="screen" />
- <field type="CARD32" name="drawable" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="drawable_table_index" />
- <field type="CARD32" name="drawable_table_stamp" />
- <field type="INT16" name="drawable_origin_X" />
- <field type="INT16" name="drawable_origin_Y" />
- <field type="INT16" name="drawable_size_W" />
- <field type="INT16" name="drawable_size_H" />
- <field type="CARD32" name="num_clip_rects" />
- <pad bytes="4" />
- <list type="DrmClipRect" name="clip_rects">
- <fieldref>num_clip_rects</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="GetDeviceInfo" opcode="10">
- <field type="CARD32" name="screen" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="framebuffer_handle_low" />
- <field type="CARD32" name="framebuffer_handle_high" />
- <field type="CARD32" name="framebuffer_origin_offset" />
- <field type="CARD32" name="framebuffer_size" />
- <field type="CARD32" name="framebuffer_stride" />
- <field type="CARD32" name="device_private_size" />
- <list type="CARD32" name="device_private">
- <fieldref>device_private_size</fieldref>
- </list>
- </reply>
- </request>
-
- <!-- Not in this doc, but specified in Mesa/src/glx/x11/xf86dri.h -->
- <request name="AuthConnection" opcode="11">
- <field type="CARD32" name="screen" />
- <field type="CARD32" name="magic" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="authenticated" />
- </reply>
- </request>
+<!-- Using http://dri.sourceforge.net/doc/dri_extensions_low_level.txt -->
+<!-- Types -->
+ <struct name="DrmClipRect">
+ <field type="INT16" name="x1"/>
+ <field type="INT16" name="y1"/>
+ <field type="INT16" name="x2"/>
+ <field type="INT16" name="x3"/>
+ </struct>
+<!-- Requests -->
+ <request name="QueryVersion" opcode="0">
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="dri_major_version"/>
+ <field type="CARD16" name="dri_minor_version"/>
+ <field type="CARD32" name="dri_minor_patch"/>
+ </reply>
+ </request>
+ <request name="QueryDirectRenderingCapable" opcode="1">
+ <field type="CARD32" name="screen"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="BOOL" name="is_capable"/>
+ </reply>
+ </request>
+ <request name="OpenConnection" opcode="2">
+ <field type="CARD32" name="screen"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="drm_client_key_low"/>
+ <field type="CARD32" name="drm_client_key_high"/>
+ <field type="CARD32" name="sarea_handle_low"/>
+ <field type="CARD32" name="sarea_handle_high"/>
+ <field type="CARD32" name="bus_id_len"/>
+ <pad bytes="12"/>
+ <list type="CARD8" name="bus_id">
+ <fieldref>bus_id_len</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="CloseConnection" opcode="3">
+ <field type="CARD32" name="screen"/>
+ </request>
+ <request name="GetClientDriverName" opcode="4">
+ <field type="CARD32" name="screen"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="client_driver_major_version"/>
+ <field type="CARD32" name="client_driver_minor_version"/>
+ <field type="CARD32" name="client_driver_patch_version"/>
+ <field type="CARD32" name="client_driver_name_len"/>
+ <pad bytes="8"/>
+ <list type="CARD8" name="client_driver_name">
+ <fieldref>client_driver_name_len</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="CreateContext" opcode="5">
+ <field type="CARD32" name="visual"/>
+ <field type="CARD32" name="screen"/>
+ <field type="CARD32" name="context"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="hw_context"/>
+ </reply>
+ </request>
+ <request name="DestroyContext" opcode="6">
+ <field type="CARD32" name="screen"/>
+ <field type="CARD32" name="context"/>
+ </request>
+ <request name="CreateDrawable" opcode="7">
+ <field type="CARD32" name="screen"/>
+ <field type="CARD32" name="drawable"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="hw_drawable_handle"/>
+ </reply>
+ </request>
+ <request name="DestroyDrawable" opcode="8">
+ <field type="CARD32" name="screen"/>
+ <field type="CARD32" name="drawable"/>
+ </request>
+ <request name="GetDrawableInfo" opcode="9">
+ <field type="CARD32" name="screen"/>
+ <field type="CARD32" name="drawable"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="drawable_table_index"/>
+ <field type="CARD32" name="drawable_table_stamp"/>
+ <field type="INT16" name="drawable_origin_X"/>
+ <field type="INT16" name="drawable_origin_Y"/>
+ <field type="INT16" name="drawable_size_W"/>
+ <field type="INT16" name="drawable_size_H"/>
+ <field type="CARD32" name="num_clip_rects"/>
+ <pad bytes="4"/>
+ <list type="DrmClipRect" name="clip_rects">
+ <fieldref>num_clip_rects</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GetDeviceInfo" opcode="10">
+ <field type="CARD32" name="screen"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="framebuffer_handle_low"/>
+ <field type="CARD32" name="framebuffer_handle_high"/>
+ <field type="CARD32" name="framebuffer_origin_offset"/>
+ <field type="CARD32" name="framebuffer_size"/>
+ <field type="CARD32" name="framebuffer_stride"/>
+ <field type="CARD32" name="device_private_size"/>
+ <list type="CARD32" name="device_private">
+ <fieldref>device_private_size</fieldref>
+ </list>
+ </reply>
+ </request>
+<!-- Not in this doc, but specified in Mesa/src/glx/x11/xf86dri.h -->
+ <request name="AuthConnection" opcode="11">
+ <field type="CARD32" name="screen"/>
+ <field type="CARD32" name="magic"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="authenticated"/>
+ </reply>
+ </request>
</xcb>
diff --git a/xcb-proto/src/extensions/xfixes.xml b/xcb-proto/src/extensions/xfixes.xml
index 73157cd..e5d1354 100644
--- a/xcb-proto/src/extensions/xfixes.xml
+++ b/xcb-proto/src/extensions/xfixes.xml
@@ -28,108 +28,114 @@ authorization from the authors.
<xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes">
<import>render</import>
<import>shape</import>
-
- <!-- Version 1 -->
+<!-- Version 1 -->
<request name="QueryVersion" opcode="0">
- <field type="CARD32" name="client_major_version" />
- <field type="CARD32" name="client_minor_version" />
+ <field type="CARD32" name="client_major_version"/>
+ <field type="CARD32" name="client_minor_version"/>
<reply>
- <pad bytes="1" />
- <field type="CARD32" name="major_version" />
- <field type="CARD32" name="minor_version" />
- <pad bytes="16" />
+ <pad bytes="1"/>
+ <field type="CARD32" name="major_version"/>
+ <field type="CARD32" name="minor_version"/>
+ <pad bytes="16"/>
</reply>
</request>
-
<enum name="SaveSetMode">
- <item name="Insert" />
- <item name="Delete" />
+ <item name="Insert"/>
+ <item name="Delete"/>
</enum>
-
<enum name="SaveSetTarget">
- <item name="Nearest" />
- <item name="Root" />
+ <item name="Nearest"/>
+ <item name="Root"/>
</enum>
-
<enum name="SaveSetMapping">
- <item name="Map" />
- <item name="Unmap" />
+ <item name="Map"/>
+ <item name="Unmap"/>
</enum>
-
<request name="ChangeSaveSet" opcode="1">
- <field type="BYTE" name="mode" /> <!-- SaveSetMode -->
- <field type="BYTE" name="target" /> <!-- SaveSetTarget -->
- <field type="BYTE" name="map" /> <!-- SaveSetMapping -->
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <field type="BYTE" name="mode"/>
+<!-- SaveSetMode -->
+ <field type="BYTE" name="target"/>
+<!-- SaveSetTarget -->
+ <field type="BYTE" name="map"/>
+<!-- SaveSetMapping -->
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
</request>
-
<enum name="SelectionEvent">
- <item name="SetSelectionOwner" />
- <item name="SelectionWindowDestroy" />
- <item name="SelectionClientClose" />
+ <item name="SetSelectionOwner"/>
+ <item name="SelectionWindowDestroy"/>
+ <item name="SelectionClientClose"/>
</enum>
-
<enum name="SelectionEventMask">
<item name="SetSelectionOwner">
- <op op="<<"><value>1</value><value>0</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>0</value>
+ </op>
</item>
<item name="SelectionWindowDestroy">
- <op op="<<"><value>1</value><value>1</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>1</value>
+ </op>
</item>
<item name="SelectionClientClose">
- <op op="<<"><value>1</value><value>2</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>2</value>
+ </op>
</item>
</enum>
-
<event name="SelectionNotify" number="0">
- <field type="CARD8" name="subtype" /> <!-- SelectionEvent -->
- <field type="WINDOW" name="window" />
- <field type="WINDOW" name="owner" />
- <field type="ATOM" name="selection" />
- <field type="TIMESTAMP" name="time" />
- <field type="TIMESTAMP" name="selection_time" />
- <pad bytes="8" />
+ <field type="CARD8" name="subtype"/>
+<!-- SelectionEvent -->
+ <field type="WINDOW" name="window"/>
+ <field type="WINDOW" name="owner"/>
+ <field type="ATOM" name="selection"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="TIMESTAMP" name="selection_time"/>
+ <pad bytes="8"/>
</event>
-
<request name="SelectSelectionInput" opcode="2">
- <field type="WINDOW" name="window" />
- <field type="ATOM" name="selection" />
- <field type="CARD32" name="event_mask" /> <!-- SelectionEventMask -->
+ <field type="WINDOW" name="window"/>
+ <field type="ATOM" name="selection"/>
+ <field type="CARD32" name="event_mask"/>
+<!-- SelectionEventMask -->
</request>
-
<enum name="CursorNotify">
- <item name="DisplayCursor" />
+ <item name="DisplayCursor"/>
</enum>
-
<enum name="CursorNotifyMask">
<item name="DisplayCursor">
- <op op="<<"><value>1</value><value>0</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>0</value>
+ </op>
</item>
</enum>
-
<event name="CursorNotify" number="1">
- <field type="CARD8" name="subtype" /> <!-- CursorNotify -->
- <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 -->
- <pad bytes="12" />
+ <field type="CARD8" name="subtype"/>
+<!-- CursorNotify -->
+ <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 -->
+ <pad bytes="12"/>
</event>
-
<request name="SelectCursorInput" opcode="3">
- <field type="WINDOW" name="window" />
- <field type="CARD32" name="event_mask" /> <!-- CursorNotifyMask -->
+ <field type="WINDOW" name="window"/>
+ <field type="CARD32" name="event_mask"/>
+<!-- CursorNotifyMask -->
</request>
-
<request name="GetCursorImage" opcode="4">
<reply>
- <pad bytes="1" />
- <field type="RECTANGLE" />
- <field type="POINT" name="hot_point" />
- <field type="CARD32" name="cursor_serial" />
- <pad bytes="8" />
- <list type="CARD32" name="cursor_image">
+ <pad bytes="1"/>
+ <field type="RECTANGLE"/>
+ <field type="POINT" name="hot_point"/>
+ <field type="CARD32" name="cursor_serial"/>
+ <pad bytes="8"/>
+ <list type="CARD32" name="cursor_image">
<op op="*">
<fieldref>width</fieldref>
<fieldref>height</fieldref>
@@ -137,148 +143,130 @@ authorization from the authors.
</list>
</reply>
</request>
-
- <!-- Version 2 -->
-
- <xidtype name="REGION" />
-
- <error name="BadRegion" number="0" />
-
+<!-- Version 2 -->
+ <xidtype name="REGION"/>
+ <error name="BadRegion" number="0"/>
<request name="CreateRegion" opcode="5">
- <field type="REGION" name="region" />
- <list type="RECTANGLE" name="rectangles" />
+ <field type="REGION" name="region"/>
+ <list type="RECTANGLE" name="rectangles"/>
</request>
-
<request name="CreateRegionFromBitmap" opcode="6">
- <field type="REGION" name="region" />
- <field type="PIXMAP" name="bitmap" />
+ <field type="REGION" name="region"/>
+ <field type="PIXMAP" name="bitmap"/>
</request>
-
<request name="CreateRegionFromWindow" opcode="7">
- <field type="REGION" name="region" />
- <field type="WINDOW" name="window" />
- <field type="SHAPE_KIND" name="kind" />
- <pad bytes="3" />
+ <field type="REGION" name="region"/>
+ <field type="WINDOW" name="window"/>
+ <field type="SHAPE_KIND" name="kind"/>
+ <pad bytes="3"/>
</request>
-
<request name="CreateRegionFromGC" opcode="8">
- <field type="REGION" name="region" />
- <field type="GCONTEXT" name="gc" />
+ <field type="REGION" name="region"/>
+ <field type="GCONTEXT" name="gc"/>
</request>
-
<request name="CreateRegionFromPicture" opcode="9">
- <field type="REGION" name="region" />
- <field type="PICTURE" name="picture" />
+ <field type="REGION" name="region"/>
+ <field type="PICTURE" name="picture"/>
</request>
-
<request name="DestroyRegion" opcode="10">
- <field type="REGION" name="region" />
+ <field type="REGION" name="region"/>
</request>
-
<request name="SetRegion" opcode="11">
- <field type="REGION" name="region" />
- <list type="RECTANGLE" name="rectangles" />
+ <field type="REGION" name="region"/>
+ <list type="RECTANGLE" name="rectangles"/>
</request>
-
<request name="CopyRegion" opcode="12">
- <field type="REGION" name="source" />
- <field type="REGION" name="destination" />
+ <field type="REGION" name="source"/>
+ <field type="REGION" name="destination"/>
</request>
-
<request name="UnionRegion" opcode="13">
- <field type="REGION" name="source1" />
- <field type="REGION" name="source2" />
- <field type="REGION" name="destination" />
+ <field type="REGION" name="source1"/>
+ <field type="REGION" name="source2"/>
+ <field type="REGION" name="destination"/>
</request>
-
<request name="IntersectRegion" opcode="14">
- <field type="REGION" name="source1" />
- <field type="REGION" name="source2" />
- <field type="REGION" name="destination" />
+ <field type="REGION" name="source1"/>
+ <field type="REGION" name="source2"/>
+ <field type="REGION" name="destination"/>
</request>
-
<request name="SubtractRegion" opcode="15">
- <field type="REGION" name="source1" />
- <field type="REGION" name="source2" />
- <field type="REGION" name="destination" />
+ <field type="REGION" name="source1"/>
+ <field type="REGION" name="source2"/>
+ <field type="REGION" name="destination"/>
</request>
-
<request name="InvertRegion" opcode="16">
- <field type="REGION" name="source" />
- <field type="RECTANGLE" name="bounds" />
- <field type="REGION" name="destination" />
+ <field type="REGION" name="source"/>
+ <field type="RECTANGLE" name="bounds"/>
+ <field type="REGION" name="destination"/>
</request>
-
<request name="TranslateRegion" opcode="17">
- <field type="REGION" name="region" />
- <field type="INT16" name="dx" />
- <field type="INT16" name="dy" />
- </request>
-
- <request name="RegionExtents" opcode="18">
- <field type="REGION" name="source" />
- <field type="REGION" name="destination" />
+ <field type="REGION" name="region"/>
+ <field type="INT16" name="dx"/>
+ <field type="INT16" name="dy"/>
+ </request>
+ <request name="RegionExtents" opcode="18">
+ <field type="REGION" name="source"/>
+ <field type="REGION" name="destination"/>
</request>
-
<request name="FetchRegion" opcode="19">
- <field type="REGION" name="region" />
+ <field type="REGION" name="region"/>
<reply>
- <pad bytes="1" />
- <field type="RECTANGLE" name="extents" />
- <pad bytes="16" />
- <list type="RECTANGLE" name="rectangles" />
+ <pad bytes="1"/>
+ <field type="RECTANGLE" name="extents"/>
+ <pad bytes="16"/>
+ <list type="RECTANGLE" name="rectangles"/>
</reply>
</request>
-
<request name="SetGCClipRegion" opcode="20">
- <field type="GCONTEXT" name="gc" />
- <field type="REGION" name="region" />
- <field type="POINT" name="origin" />
+ <field type="GCONTEXT" name="gc"/>
+ <field type="REGION" name="region"/>
+ <field type="POINT" name="origin"/>
</request>
-
<request name="SetWindowShapeRegion" opcode="21">
- <field type="WINDOW" name="dest" />
- <field type="SHAPE_KIND" name="dest_kind" />
- <pad bytes="3" />
- <field type="POINT" name="offset" />
- <field type="REGION" name="region" />
+ <field type="WINDOW" name="dest"/>
+ <field type="SHAPE_KIND" name="dest_kind"/>
+ <pad bytes="3"/>
+ <field type="POINT" name="offset"/>
+ <field type="REGION" name="region"/>
</request>
-
<request name="SetPictureClipRegion" opcode="22">
- <field type="PICTURE" name="picture" />
- <field type="REGION" name="region" />
- <field type="POINT" name="origin" />
+ <field type="PICTURE" name="picture"/>
+ <field type="REGION" name="region"/>
+ <field type="POINT" name="origin"/>
</request>
-
<request name="SetCursorName" opcode="23">
- <field type="CURSOR" name="cursor" />
- <field type="CARD16" name="nbytes" />
- <pad bytes="2" />
- <list type="CARD8" name="name"><fieldref>nbytes</fieldref></list>
+ <field type="CURSOR" name="cursor"/>
+ <field type="CARD16" name="nbytes"/>
+ <pad bytes="2"/>
+ <list type="CARD8" name="name">
+ <fieldref>nbytes</fieldref>
+ </list>
</request>
-
<request name="GetCursorName" opcode="24">
- <field type="CURSOR" name="cursor" />
+ <field type="CURSOR" name="cursor"/>
<reply>
- <pad bytes="1" />
- <field type="ATOM" name="atom" />
- <field type="CARD16" name="nbytes" />
- <pad bytes="18" />
- <list type="CARD8" name="name"><fieldref>nbytes</fieldref></list>
+ <pad bytes="1"/>
+ <field type="ATOM" name="atom"/>
+ <field type="CARD16" name="nbytes"/>
+ <pad bytes="18"/>
+ <list type="CARD8" name="name">
+ <fieldref>nbytes</fieldref>
+ </list>
</reply>
</request>
-
<request name="GetCursorImageAndName" opcode="25">
<reply>
- <pad bytes="1" />
- <field type="RECTANGLE" />
- <field type="POINT" name="hot_point" />
- <field type="CARD32" name="cursor_serial" />
- <field type="ATOM" name="cursor_atom" />
- <field type="CARD16" name="nbytes" />
- <pad bytes="2" />
- <list type="CARD8" name="name"><fieldref>nbytes</fieldref></list>
- <list type="CARD32" name="cursor_image">
+ <pad bytes="1"/>
+ <field type="RECTANGLE"/>
+ <field type="POINT" name="hot_point"/>
+ <field type="CARD32" name="cursor_serial"/>
+ <field type="ATOM" name="cursor_atom"/>
+ <field type="CARD16" name="nbytes"/>
+ <pad bytes="2"/>
+ <list type="CARD8" name="name">
+ <fieldref>nbytes</fieldref>
+ </list>
+ <list type="CARD32" name="cursor_image">
<op op="*">
<fieldref>width</fieldref>
<fieldref>height</fieldref>
@@ -286,26 +274,25 @@ authorization from the authors.
</list>
</reply>
</request>
-
<request name="ChangeCursor" opcode="26">
- <field type="CURSOR" name="source" />
- <field type="CURSOR" name="destination" />
+ <field type="CURSOR" name="source"/>
+ <field type="CURSOR" name="destination"/>
</request>
-
<request name="ChangeCursorByName" opcode="27">
- <field type="CURSOR" name="src" />
- <field type="CARD16" name="nbytes" />
- <pad bytes="2" />
- <list type="CARD8" name="name"><fieldref>nbytes</fieldref></list>
+ <field type="CURSOR" name="src"/>
+ <field type="CARD16" name="nbytes"/>
+ <pad bytes="2"/>
+ <list type="CARD8" name="name">
+ <fieldref>nbytes</fieldref>
+ </list>
</request>
-
- <!-- Version 3 -->
+<!-- Version 3 -->
<request name="ExpandRegion" opcode="28">
- <field type="REGION" name="source" />
- <field type="REGION" name="destination" />
- <field type="CARD16" name="left" />
- <field type="CARD16" name="right" />
- <field type="CARD16" name="top" />
- <field type="CARD16" name="bottom" />
+ <field type="REGION" name="source"/>
+ <field type="REGION" name="destination"/>
+ <field type="CARD16" name="left"/>
+ <field type="CARD16" name="right"/>
+ <field type="CARD16" name="top"/>
+ <field type="CARD16" name="bottom"/>
</request>
</xcb>
diff --git a/xcb-proto/src/extensions/xprint.xml b/xcb-proto/src/extensions/xprint.xml
index 5fc8923..9a5f81a 100644
--- a/xcb-proto/src/extensions/xprint.xml
+++ b/xcb-proto/src/extensions/xprint.xml
@@ -25,301 +25,291 @@ 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 -->
-
- <!-- Types -->
- <struct name="PRINTER">
- <field type="CARD32" name="nameLen" />
- <list type="STRING8" name="name">
- <fieldref>nameLen</fieldref>
- </list>
- <!-- Padding -->
- <field type="CARD32" name="descLen" />
- <list type="STRING8" name="description">
- <fieldref>descLen</fieldref>
- </list>
- <!-- More padding -->
- </struct>
-
- <!--<typedef oldname="CARD32" newname="PCONTEXT" />-->
- <xidtype name="PCONTEXT" />
- <typedef oldname="char" newname="STRING8" />
-
- <!-- "PrintGetDocumentData" -->
- <enum name="GetDoc">
- <item name="Finished"><value>0</value></item>
- <item name="SecondConsumer"><value>1</value></item>
- </enum>
-
- <!-- Event Mask ("PrintSelectInput") -->
- <enum name="EvMask">
- <item name="NoEventMask"><value>0x00000000</value></item>
- <item name="PrintMask"><value>0x00000001</value></item>
- <item name="AttributeMask"><value>0x00000002</value></item>
- </enum>
-
- <!-- "PrintNotify" detail -->
- <enum name="Detail">
- <item name="StartJobNotify"><value>1</value></item>
- <item name="EndJobNotify"><value>2</value></item>
- <item name="StartDocNotify"><value>3</value></item>
- <item name="EndDocNotify"><value>4</value></item>
- <item name="StartPageNotify"><value>5</value></item>
- <item name="EndPageNotify"><value>6</value></item>
- </enum>
-
- <!-- "AttributeNotify" detail -->
- <enum name="Attr">
- <item name="JobAttr"><value>1</value></item>
- <item name="DocAttr"><value>2</value></item>
- <item name="PageAttr"><value>3</value></item>
- <item name="PrinterAttr"><value>4</value></item>
- <item name="ServerAttr"><value>5</value></item>
- <item name="MediumAttr"><value>6</value></item>
- <item name="SpoolerAttr"><value>7</value></item>
- </enum>
-
-
- <!-- Requests -->
- <request name="PrintQueryVersion" opcode="0">
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="major_version" />
- <field type="CARD16" name="minor_version" />
- </reply>
- </request>
-
- <request name="PrintGetPrinterList" opcode="1">
- <field type="CARD32" name="printerNameLen" />
- <field type="CARD32" name="localeLen" />
- <list type="STRING8" name="printer_name">
- <fieldref>printerNameLen</fieldref>
- </list>
- <!-- There's some padding in here... -->
- <list type="STRING8" name="locale">
- <fieldref>localeLen</fieldref>
- </list>
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="listCount" />
- <pad bytes="20" />
- <list type="PRINTER" name="printers">
- <fieldref>listCount</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="PrintRehashPrinterList" opcode="20" />
-
- <request name="CreateContext" opcode="2">
- <field type="CARD32" name="context_id" />
- <field type="CARD32" name="printerNameLen" />
- <field type="CARD32" name="localeLen" />
- <list type="STRING8" name="printerName">
- <fieldref>printerNameLen</fieldref>
- </list>
- <!-- padding -->
- <list type="STRING8" name="locale">
- <fieldref>localeLen</fieldref>
- </list>
- </request>
-
- <request name="PrintSetContext" opcode="3">
- <field type="CARD32" name="context" />
- </request>
-
- <request name="PrintGetContext" opcode="4">
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="context" />
- </reply>
- </request>
-
- <request name="PrintDestroyContext" opcode="5">
- <field type="CARD32" name="context" />
- </request>
-
- <request name="PrintGetScreenOfContext" opcode="6">
- <reply>
- <pad bytes="1" />
- <field type="WINDOW" name="root" />
- </reply>
- </request>
-
- <request name="PrintStartJob" opcode="7">
- <field type="CARD8" name="output_mode"/>
- </request>
-
- <request name="PrintEndJob" opcode="8">
- <field type="BOOL" name="cancel" />
- </request>
-
- <request name="PrintStartDoc" opcode="9">
- <field type="CARD8" name="driver_mode" />
- </request>
-
- <request name="PrintEndDoc" opcode="10">
- <field type="BOOL" name="cancel" />
- </request>
-
- <request name="PrintPutDocumentData" opcode="11">
- <field type="DRAWABLE" name="drawable" />
- <field type="CARD32" name="len_data" />
- <field type="CARD16" name="len_fmt" />
- <field type="CARD16" name="len_options" />
- <list type="BYTE" name="data">
- <fieldref>len_data</fieldref>
- </list>
- <!-- padding -->
- <list type="STRING8" name="doc_format" />
- <!-- padding -->
- <list type="STRING8" name="options" />
- </request>
-
- <request name="PrintGetDocumentData" opcode="12">
- <field type="PCONTEXT" name="context" />
- <field type="CARD32" name="max_bytes" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="status_code" />
- <field type="CARD32" name="finished_flag" />
- <field type="CARD32" name="dataLen" />
- <pad bytes="12" />
- <list type="BYTE" name="data">
- <fieldref>dataLen</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="PrintStartPage" opcode="13">
- <field type="WINDOW" name="window" />
- </request>
-
- <request name="PrintEndPage" opcode="14">
- <field type="BOOL" name="cancel" />
- <pad bytes="3" />
- </request>
-
- <request name="PrintSelectInput" opcode="15">
- <field type="PCONTEXT" name="context" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="event_mask"
- value-list-name="event_list" />
- </request>
-
- <request name="PrintInputSelected" opcode="16">
- <field type="PCONTEXT" name="context" />
- <reply>
- <pad bytes="1" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="event_mask"
- value-list-name="event_list" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="all_events_mask"
- value-list-name="all_events_list" />
- </reply>
- </request>
-
- <request name="PrintGetAttributes" opcode="17">
- <field type="PCONTEXT" name="context" />
- <field type="CARD8" name="pool" />
- <pad bytes="3" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="stringLen" />
- <pad bytes="20" />
- <field type="STRING8" name="attributes" />
- </reply>
- </request>
-
- <request name="PrintGetOneAttributes" opcode="19">
- <field type="PCONTEXT" name="context" />
- <field type="CARD32" name="nameLen" />
- <field type="CARD8" name="pool" />
- <pad bytes="3" />
- <list type="STRING8" name="name">
- <fieldref>nameLen</fieldref>
- </list>
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="valueLen" />
- <pad bytes="20" />
- <list type="STRING8" name="value">
- <fieldref>valueLen</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="PrintSetAttributes" opcode="18">
- <field type="PCONTEXT" name="context" />
- <field type="CARD32" name="stringLen" />
- <field type="CARD8" name="pool" />
- <field type="CARD8" name="rule" />
- <pad bytes="2" />
- <list type="STRING8" name="attributes" />
- </request>
-
- <request name="PrintGetPageDimensions" opcode="21">
- <field type="PCONTEXT" name="context" />
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="width" />
- <field type="CARD16" name="height" />
- <field type="CARD16" name="offset_x" />
- <field type="CARD16" name="offset_y" />
- <field type="CARD16" name="reproducible_width" />
- <field type="CARD16" name="reproducible_height" />
- </reply>
- </request>
-
- <request name="PrintQueryScreens" opcode="22">
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="listCount" />
- <pad bytes="20" />
- <list type="WINDOW" name="roots">
- <fieldref>listCount</fieldref>
- </list>
- <!-- There may be a WINDOW rootWindow here... -->
- </reply>
- </request>
-
- <request name="PrintSetImageResolution" opcode="23">
- <field type="PCONTEXT" name="context" />
- <field type="CARD16" name="image_resolution" />
- <reply>
- <field type="BOOL" name="status" />
- <field type="CARD16" name="previous_resolutions" />
- </reply>
- </request>
-
- <request name="PrintGetImageResolution" opcode="24">
- <field type="PCONTEXT" name="context" />
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="image_resolution" />
- </reply>
- </request>
-
-
- <!-- Events -->
- <event name="Notify" number="0">
- <field type="CARD8" name="detail" />
- <field type="PCONTEXT" name="context" />
- <field type="BOOL" name="cancel" />
- </event>
-
- <event name="AttributNotify" number="1">
- <field type="CARD8" name="detail" />
- <field type="PCONTEXT" name="context" />
- </event>
-
- <!-- Errors -->
- <error name="BadContext" number="0" />
- <error name="BadSequence" number="1" />
-
+<!-- Conforms to XPRINT 1.0 -->
+<!-- Types -->
+ <struct name="PRINTER">
+ <field type="CARD32" name="nameLen"/>
+ <list type="STRING8" name="name">
+ <fieldref>nameLen</fieldref>
+ </list>
+<!-- Padding -->
+ <field type="CARD32" name="descLen"/>
+ <list type="STRING8" name="description">
+ <fieldref>descLen</fieldref>
+ </list>
+<!-- More padding -->
+ </struct>
+<!--<typedef oldname="CARD32" newname="PCONTEXT" />-->
+ <xidtype name="PCONTEXT"/>
+ <typedef oldname="char" newname="STRING8"/>
+<!-- "PrintGetDocumentData" -->
+ <enum name="GetDoc">
+ <item name="Finished">
+ <value>0</value>
+ </item>
+ <item name="SecondConsumer">
+ <value>1</value>
+ </item>
+ </enum>
+<!-- Event Mask ("PrintSelectInput") -->
+ <enum name="EvMask">
+ <item name="NoEventMask">
+ <value>0x00000000</value>
+ </item>
+ <item name="PrintMask">
+ <value>0x00000001</value>
+ </item>
+ <item name="AttributeMask">
+ <value>0x00000002</value>
+ </item>
+ </enum>
+<!-- "PrintNotify" detail -->
+ <enum name="Detail">
+ <item name="StartJobNotify">
+ <value>1</value>
+ </item>
+ <item name="EndJobNotify">
+ <value>2</value>
+ </item>
+ <item name="StartDocNotify">
+ <value>3</value>
+ </item>
+ <item name="EndDocNotify">
+ <value>4</value>
+ </item>
+ <item name="StartPageNotify">
+ <value>5</value>
+ </item>
+ <item name="EndPageNotify">
+ <value>6</value>
+ </item>
+ </enum>
+<!-- "AttributeNotify" detail -->
+ <enum name="Attr">
+ <item name="JobAttr">
+ <value>1</value>
+ </item>
+ <item name="DocAttr">
+ <value>2</value>
+ </item>
+ <item name="PageAttr">
+ <value>3</value>
+ </item>
+ <item name="PrinterAttr">
+ <value>4</value>
+ </item>
+ <item name="ServerAttr">
+ <value>5</value>
+ </item>
+ <item name="MediumAttr">
+ <value>6</value>
+ </item>
+ <item name="SpoolerAttr">
+ <value>7</value>
+ </item>
+ </enum>
+<!-- Requests -->
+ <request name="PrintQueryVersion" opcode="0">
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="major_version"/>
+ <field type="CARD16" name="minor_version"/>
+ </reply>
+ </request>
+ <request name="PrintGetPrinterList" opcode="1">
+ <field type="CARD32" name="printerNameLen"/>
+ <field type="CARD32" name="localeLen"/>
+ <list type="STRING8" name="printer_name">
+ <fieldref>printerNameLen</fieldref>
+ </list>
+<!-- There's some padding in here... -->
+ <list type="STRING8" name="locale">
+ <fieldref>localeLen</fieldref>
+ </list>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="listCount"/>
+ <pad bytes="20"/>
+ <list type="PRINTER" name="printers">
+ <fieldref>listCount</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="PrintRehashPrinterList" opcode="20"/>
+ <request name="CreateContext" opcode="2">
+ <field type="CARD32" name="context_id"/>
+ <field type="CARD32" name="printerNameLen"/>
+ <field type="CARD32" name="localeLen"/>
+ <list type="STRING8" name="printerName">
+ <fieldref>printerNameLen</fieldref>
+ </list>
+<!-- padding -->
+ <list type="STRING8" name="locale">
+ <fieldref>localeLen</fieldref>
+ </list>
+ </request>
+ <request name="PrintSetContext" opcode="3">
+ <field type="CARD32" name="context"/>
+ </request>
+ <request name="PrintGetContext" opcode="4">
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="context"/>
+ </reply>
+ </request>
+ <request name="PrintDestroyContext" opcode="5">
+ <field type="CARD32" name="context"/>
+ </request>
+ <request name="PrintGetScreenOfContext" opcode="6">
+ <reply>
+ <pad bytes="1"/>
+ <field type="WINDOW" name="root"/>
+ </reply>
+ </request>
+ <request name="PrintStartJob" opcode="7">
+ <field type="CARD8" name="output_mode"/>
+ </request>
+ <request name="PrintEndJob" opcode="8">
+ <field type="BOOL" name="cancel"/>
+ </request>
+ <request name="PrintStartDoc" opcode="9">
+ <field type="CARD8" name="driver_mode"/>
+ </request>
+ <request name="PrintEndDoc" opcode="10">
+ <field type="BOOL" name="cancel"/>
+ </request>
+ <request name="PrintPutDocumentData" opcode="11">
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="CARD32" name="len_data"/>
+ <field type="CARD16" name="len_fmt"/>
+ <field type="CARD16" name="len_options"/>
+ <list type="BYTE" name="data">
+ <fieldref>len_data</fieldref>
+ </list>
+<!-- padding -->
+ <list type="STRING8" name="doc_format"/>
+<!-- padding -->
+ <list type="STRING8" name="options"/>
+ </request>
+ <request name="PrintGetDocumentData" opcode="12">
+ <field type="PCONTEXT" name="context"/>
+ <field type="CARD32" name="max_bytes"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="status_code"/>
+ <field type="CARD32" name="finished_flag"/>
+ <field type="CARD32" name="dataLen"/>
+ <pad bytes="12"/>
+ <list type="BYTE" name="data">
+ <fieldref>dataLen</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="PrintStartPage" opcode="13">
+ <field type="WINDOW" name="window"/>
+ </request>
+ <request name="PrintEndPage" opcode="14">
+ <field type="BOOL" name="cancel"/>
+ <pad bytes="3"/>
+ </request>
+ <request name="PrintSelectInput" opcode="15">
+ <field type="PCONTEXT" name="context"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="event_mask" value-list-name="event_list"/>
+ </request>
+ <request name="PrintInputSelected" opcode="16">
+ <field type="PCONTEXT" name="context"/>
+ <reply>
+ <pad bytes="1"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="event_mask" value-list-name="event_list"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="all_events_mask" value-list-name="all_events_list"/>
+ </reply>
+ </request>
+ <request name="PrintGetAttributes" opcode="17">
+ <field type="PCONTEXT" name="context"/>
+ <field type="CARD8" name="pool"/>
+ <pad bytes="3"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="stringLen"/>
+ <pad bytes="20"/>
+ <field type="STRING8" name="attributes"/>
+ </reply>
+ </request>
+ <request name="PrintGetOneAttributes" opcode="19">
+ <field type="PCONTEXT" name="context"/>
+ <field type="CARD32" name="nameLen"/>
+ <field type="CARD8" name="pool"/>
+ <pad bytes="3"/>
+ <list type="STRING8" name="name">
+ <fieldref>nameLen</fieldref>
+ </list>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="valueLen"/>
+ <pad bytes="20"/>
+ <list type="STRING8" name="value">
+ <fieldref>valueLen</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="PrintSetAttributes" opcode="18">
+ <field type="PCONTEXT" name="context"/>
+ <field type="CARD32" name="stringLen"/>
+ <field type="CARD8" name="pool"/>
+ <field type="CARD8" name="rule"/>
+ <pad bytes="2"/>
+ <list type="STRING8" name="attributes"/>
+ </request>
+ <request name="PrintGetPageDimensions" opcode="21">
+ <field type="PCONTEXT" name="context"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="width"/>
+ <field type="CARD16" name="height"/>
+ <field type="CARD16" name="offset_x"/>
+ <field type="CARD16" name="offset_y"/>
+ <field type="CARD16" name="reproducible_width"/>
+ <field type="CARD16" name="reproducible_height"/>
+ </reply>
+ </request>
+ <request name="PrintQueryScreens" opcode="22">
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="listCount"/>
+ <pad bytes="20"/>
+ <list type="WINDOW" name="roots">
+ <fieldref>listCount</fieldref>
+ </list>
+<!-- There may be a WINDOW rootWindow here... -->
+ </reply>
+ </request>
+ <request name="PrintSetImageResolution" opcode="23">
+ <field type="PCONTEXT" name="context"/>
+ <field type="CARD16" name="image_resolution"/>
+ <reply>
+ <field type="BOOL" name="status"/>
+ <field type="CARD16" name="previous_resolutions"/>
+ </reply>
+ </request>
+ <request name="PrintGetImageResolution" opcode="24">
+ <field type="PCONTEXT" name="context"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="image_resolution"/>
+ </reply>
+ </request>
+<!-- Events -->
+ <event name="Notify" number="0">
+ <field type="CARD8" name="detail"/>
+ <field type="PCONTEXT" name="context"/>
+ <field type="BOOL" name="cancel"/>
+ </event>
+ <event name="AttributNotify" number="1">
+ <field type="CARD8" name="detail"/>
+ <field type="PCONTEXT" name="context"/>
+ </event>
+<!-- Errors -->
+ <error name="BadContext" number="0"/>
+ <error name="BadSequence" number="1"/>
</xcb>
-
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index 26e709d..07d7a5e 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -25,399 +25,373 @@ 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">
- <import>shm</import>
- <!-- Implements version 2.2 of XV -->
-
- <!-- XIDs -->
- <xidtype name="PORT" />
- <xidtype name="ENCODING" />
-
- <enum name="Type">
- <item name="InputMask"><value>0x00000001</value></item>
- <item name="OutputMask"><value>0x00000002</value></item>
- <item name="VideoMask"><value>0x00000004</value></item>
- <item name="StillMask"><value>0x00000008</value></item>
- <item name="ImageMask"><value>0x00000010</value></item>
- </enum>
-
- <enum name="ImageFormatInfoType">
- <item name="RGB" />
- <item name="YUV" />
- </enum>
-
- <enum name="ImageFormatInfoFormat">
- <item name="Packed" />
- <item name="Planar" />
- </enum>
-
- <enum name="AttributeFlag">
- <item name="Gettable"><value>0x01</value></item>
- <item name="Settable"><value>0x02</value></item>
- </enum>
-
- <struct name="Rational">
- <field type="INT32" name="numerator" />
- <field type="INT32" name="denominator" />
- </struct>
-
- <struct name="AdaptorInfo">
- <field type="PORT" name="base_id" />
- <field type="CARD16" name="name_size" />
- <field type="CARD16" name="num_ports" />
- <field type="CARD16" name="num_formats" />
- <field type="CARD8" name="type" />
- <field type="CARD8" name="pad" />
- <list type="char" name="name">
- <fieldref>name_size</fieldref>
- </list>
- <list type="Format" name="formats">
- <fieldref>num_formats</fieldref>
- </list>
-
- </struct>
-
- <struct name="EncodingInfo">
- <field type="ENCODING" name="encoding" />
- <field type="CARD16" name="name_size" />
- <field type="SIZE" />
- <field type="Rational" name="rate" />
- <!--
+ <import>shm</import>
+<!-- Implements version 2.2 of XV -->
+<!-- XIDs -->
+ <xidtype name="PORT"/>
+ <xidtype name="ENCODING"/>
+ <enum name="Type">
+ <item name="InputMask">
+ <value>0x00000001</value>
+ </item>
+ <item name="OutputMask">
+ <value>0x00000002</value>
+ </item>
+ <item name="VideoMask">
+ <value>0x00000004</value>
+ </item>
+ <item name="StillMask">
+ <value>0x00000008</value>
+ </item>
+ <item name="ImageMask">
+ <value>0x00000010</value>
+ </item>
+ </enum>
+ <enum name="ImageFormatInfoType">
+ <item name="RGB"/>
+ <item name="YUV"/>
+ </enum>
+ <enum name="ImageFormatInfoFormat">
+ <item name="Packed"/>
+ <item name="Planar"/>
+ </enum>
+ <enum name="AttributeFlag">
+ <item name="Gettable">
+ <value>0x01</value>
+ </item>
+ <item name="Settable">
+ <value>0x02</value>
+ </item>
+ </enum>
+ <struct name="Rational">
+ <field type="INT32" name="numerator"/>
+ <field type="INT32" name="denominator"/>
+ </struct>
+ <struct name="AdaptorInfo">
+ <field type="PORT" name="base_id"/>
+ <field type="CARD16" name="name_size"/>
+ <field type="CARD16" name="num_ports"/>
+ <field type="CARD16" name="num_formats"/>
+ <field type="CARD8" name="type"/>
+ <field type="CARD8" name="pad"/>
+ <list type="char" name="name">
+ <fieldref>name_size</fieldref>
+ </list>
+ <list type="Format" name="formats">
+ <fieldref>num_formats</fieldref>
+ </list>
+ </struct>
+ <struct name="EncodingInfo">
+ <field type="ENCODING" name="encoding"/>
+ <field type="CARD16" name="name_size"/>
+ <field type="SIZE"/>
+ <field type="Rational" name="rate"/>
+<!--
Xvproto.h has a padding CARD16 here but the name
overlaps.
-->
- <list type="char" name="name">
- <fieldref>name_size</fieldref>
- </list>
- </struct>
-
- <struct name="Format">
- <field type="VISUALID" name="visual" />
- <field type="CARD8" name="depth" />
- </struct>
-
- <struct name="Image">
- <field type="CARD32" name="id" />
- <field type="SIZE" />
- <field type="CARD32" name="data_size" />
- <field type="CARD32" name="num_planes" />
- <list type="CARD32" name="pitches">
- <fieldref>num_planes</fieldref>
- </list>
- <list type="CARD32" name="offsets">
- <fieldref>num_planes</fieldref>
- </list>
- <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" />
- <field type="INT32" name="min" />
- <field type="INT32" name="max" />
- <field type="CARD32" name="size" />
- <list type="char" name="name">
- <fieldref>size</fieldref>
- </list>
- </struct>
-
- <struct name="ImageFormatInfo">
- <field type="CARD32" name="id" />
- <field type="CARD8" name="type" />
- <field type="CARD8" name="byte_order" />
- <field type="CARD16" name="pad1" />
- <list type="CARD8" name="guid">
- <value>16</value>
- </list>
- <field type="CARD8" name="bpp" />
- <field type="CARD8" name="num_planes" />
- <field type="CARD16" name="pad2" />
- <field type="CARD8" name="depth" />
- <field type="CARD8" name="pad3" />
- <field type="CARD16" name="pad4" />
- <field type="CARD32" name="red_mask" />
- <field type="CARD32" name="green_mask" />
- <field type="CARD32" name="blue_mask" />
- <field type="CARD8" name="format" />
- <field type="CARD8" name="pad5" />
- <field type="CARD16" name="pad6" />
- <field type="CARD32" name="y_sample_bits" />
- <field type="CARD32" name="u_sample_bits" />
- <field type="CARD32" name="v_sample_bits" />
- <field type="CARD32" name="vhorz_y_period" />
- <field type="CARD32" name="vhorz_u_period" />
- <field type="CARD32" name="vhorz_v_period" />
- <field type="CARD32" name="vvert_y_period" />
- <field type="CARD32" name="vvert_u_period" />
- <field type="CARD32" name="vvert_v_period" />
- <list type="CARD8" name="vcomp_order">
- <value>32</value>
- </list>
- <field type="CARD8" name="vscanline_order" />
- <field type="CARD8" name="vpad7" />
- <field type="CARD16" name="vpad8" />
- <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" />
- <field type="TIMESTAMP" name="time" />
- <field type="DRAWABLE" name="drawable" />
- <field type="PORT" name="port" />
- </event>
-
- <event name="PortNotify" number="1">
- <pad bytes="1" />
- <field type="TIMESTAMP" name="time" />
- <field type="PORT" name="port" />
- <field type="ATOM" name="attribute" />
- <field type="INT32" name="value" />
- </event>
-
-
- <!-- Requests -->
- <request name="QueryExtension" opcode="0">
- <reply>
- <pad bytes="1" />
- <field type="VERSION" />
- </reply>
- </request>
-
- <request name="QueryAdaptors" opcode="1">
- <field type="WINDOW" name="window" />
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="num_adaptors" />
- <pad bytes="22" />
- <list type="AdaptorInfo" name="info">
- <fieldref>num_adaptors</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="QueryEncodings" opcode="2">
- <field type="PORT" name="port" />
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="num_encodings" />
- <!--
+ <list type="char" name="name">
+ <fieldref>name_size</fieldref>
+ </list>
+ </struct>
+ <struct name="Format">
+ <field type="VISUALID" name="visual"/>
+ <field type="CARD8" name="depth"/>
+ </struct>
+ <struct name="Image">
+ <field type="CARD32" name="id"/>
+ <field type="SIZE"/>
+ <field type="CARD32" name="data_size"/>
+ <field type="CARD32" name="num_planes"/>
+ <list type="CARD32" name="pitches">
+ <fieldref>num_planes</fieldref>
+ </list>
+ <list type="CARD32" name="offsets">
+ <fieldref>num_planes</fieldref>
+ </list>
+ <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"/>
+ <field type="INT32" name="min"/>
+ <field type="INT32" name="max"/>
+ <field type="CARD32" name="size"/>
+ <list type="char" name="name">
+ <fieldref>size</fieldref>
+ </list>
+ </struct>
+ <struct name="ImageFormatInfo">
+ <field type="CARD32" name="id"/>
+ <field type="CARD8" name="type"/>
+ <field type="CARD8" name="byte_order"/>
+ <field type="CARD16" name="pad1"/>
+ <list type="CARD8" name="guid">
+ <value>16</value>
+ </list>
+ <field type="CARD8" name="bpp"/>
+ <field type="CARD8" name="num_planes"/>
+ <field type="CARD16" name="pad2"/>
+ <field type="CARD8" name="depth"/>
+ <field type="CARD8" name="pad3"/>
+ <field type="CARD16" name="pad4"/>
+ <field type="CARD32" name="red_mask"/>
+ <field type="CARD32" name="green_mask"/>
+ <field type="CARD32" name="blue_mask"/>
+ <field type="CARD8" name="format"/>
+ <field type="CARD8" name="pad5"/>
+ <field type="CARD16" name="pad6"/>
+ <field type="CARD32" name="y_sample_bits"/>
+ <field type="CARD32" name="u_sample_bits"/>
+ <field type="CARD32" name="v_sample_bits"/>
+ <field type="CARD32" name="vhorz_y_period"/>
+ <field type="CARD32" name="vhorz_u_period"/>
+ <field type="CARD32" name="vhorz_v_period"/>
+ <field type="CARD32" name="vvert_y_period"/>
+ <field type="CARD32" name="vvert_u_period"/>
+ <field type="CARD32" name="vvert_v_period"/>
+ <list type="CARD8" name="vcomp_order">
+ <value>32</value>
+ </list>
+ <field type="CARD8" name="vscanline_order"/>
+ <field type="CARD8" name="vpad7"/>
+ <field type="CARD16" name="vpad8"/>
+ <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"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="PORT" name="port"/>
+ </event>
+ <event name="PortNotify" number="1">
+ <pad bytes="1"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="PORT" name="port"/>
+ <field type="ATOM" name="attribute"/>
+ <field type="INT32" name="value"/>
+ </event>
+<!-- Requests -->
+ <request name="QueryExtension" opcode="0">
+ <reply>
+ <pad bytes="1"/>
+ <field type="VERSION"/>
+ </reply>
+ </request>
+ <request name="QueryAdaptors" opcode="1">
+ <field type="WINDOW" name="window"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="num_adaptors"/>
+ <pad bytes="22"/>
+ <list type="AdaptorInfo" name="info">
+ <fieldref>num_adaptors</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="QueryEncodings" opcode="2">
+ <field type="PORT" name="port"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="num_encodings"/>
+<!--
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>
- </list>
- </reply>
- </request>
-
- <request name="GrabPort" opcode="3">
- <field type="PORT" name="port" />
- <field type="TIMESTAMP" name="time" />
- <reply>
- <field type="BYTE" name="result" />
- </reply>
- </request>
-
- <request name="UngrabPort" opcode="4">
- <field type="PORT" name="port" />
- <field type="TIMESTAMP" name="time" />
- </request>
-
- <request name="PutVideo" opcode="5">
- <field type="PORT" name="port" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="INT16" name="vid_x" />
- <field type="INT16" name="vid_y" />
- <field type="CARD16" name="vid_w" />
- <field type="CARD16" name="vid_h" />
- <field type="INT16" name="drw_x" />
- <field type="INT16" name="drw_y" />
- <field type="CARD16" name="drw_w" />
- <field type="CARD16" name="drw_h" />
- </request>
-
- <request name="PutStill" opcode="6">
- <field type="PORT" name="port" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="INT16" name="vid_x" />
- <field type="INT16" name="vid_y" />
- <field type="CARD16" name="vid_w" />
- <field type="CARD16" name="vid_h" />
- <field type="INT16" name="drw_x" />
- <field type="INT16" name="drw_y" />
- <field type="CARD16" name="drw_w" />
- <field type="CARD16" name="drw_h" />
- </request>
-
- <request name="GetVideo" opcode="7">
- <field type="PORT" name="port" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="INT16" name="vid_x" />
- <field type="INT16" name="vid_y" />
- <field type="CARD16" name="vid_w" />
- <field type="CARD16" name="vid_h" />
- <field type="INT16" name="drw_x" />
- <field type="INT16" name="drw_y" />
- <field type="CARD16" name="drw_w" />
- <field type="CARD16" name="drw_h" />
- </request>
-
- <request name="GetStill" opcode="8">
- <field type="PORT" name="port" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="INT16" name="vid_x" />
- <field type="INT16" name="vid_y" />
- <field type="CARD16" name="vid_w" />
- <field type="CARD16" name="vid_h" />
- <field type="INT16" name="drw_x" />
- <field type="INT16" name="drw_y" />
- <field type="CARD16" name="drw_w" />
- <field type="CARD16" name="drw_h" />
- </request>
-
- <request name="StopVideo" opcode="9">
- <field type="PORT" name="port" />
- <field type="DRAWABLE" name="drawable" />
- </request>
-
- <request name="SelectVideoNotify" opcode="10">
- <field type="DRAWABLE" name="drawable" />
- <field type="BOOL" name="onoff" />
- </request>
-
- <request name="SelectPortNotify" opcode="11">
- <field type="DRAWABLE" name="drawable" />
- <field type="BOOL" name="onoff" />
- </request>
-
- <request name="QueryBestSize" opcode="12">
- <field type="PORT" name="port" />
- <field type="CARD16" name="vid_w" />
- <field type="CARD16" name="vid_h" />
- <field type="CARD16" name="drw_w" />
- <field type="CARD16" name="drw_h" />
- <field type="BOOL" name="motion" />
- <reply>
- <pad bytes="1" />
- <field type="SIZE" name="actual_size" />
- </reply>
- </request>
-
- <request name="SetPortAttribute" opcode="13">
- <field type="PORT" name="port" />
- <field type="ATOM" name="attribute" />
- <field type="INT32" name="value" />
- </request>
-
- <request name="GetPortAttribute" opcode="14">
- <field type="PORT" name="port" />
- <field type="ATOM" name="attribute" />
- <reply>
- <pad bytes="1" />
- <field type="INT32" name="value" />
- </reply>
- </request>
-
- <!-- Not in the docs beyond this point :( -->
-
- <request name="QueryPortAttributes" opcode="15">
- <field type="PORT" name="port" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_attributes" />
- <field type="CARD32" name="text_size" />
- <pad bytes="16" />
- <list type="AttributeInfo" name="attributes">
- <fieldref>num_attributes</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="ListImageFormats" opcode="16">
- <field type="PORT" name="port" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_formats" />
- <pad bytes="20" />
- <list type="ImageFormatInfo" name="format">
- <fieldref>num_formats</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="QueryImageAttributes" opcode="17">
- <field type="PORT" name="port" />
- <field type="CARD32" name="id" />
- <field type="SIZE" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="num_planes" />
- <field type="CARD32" name="data_size" />
- <field type="SIZE" />
- <pad bytes="12" />
- <list type="CARD32" name="pitches">
- <fieldref>num_planes</fieldref>
- </list>
- <list type="CARD32" name="offsets">
- <fieldref>num_planes</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="PutImage" opcode="18">
- <field type="PORT" name="port" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="CARD32" name="id" />
- <field type="INT16" name="src_x" />
- <field type="INT16" name="src_y" />
- <field type="CARD16" name="src_w" />
- <field type="CARD16" name="src_h" />
- <field type="INT16" name="drw_x" />
- <field type="INT16" name="drw_y" />
- <field type="CARD16" name="drw_w" />
- <field type="CARD16" name="drw_h" />
- <field type="CARD16" name="width" />
- <field type="CARD16" name="height" />
- <localfield type="CARD32" name="data_size" />
- <list type="CARD8" name="data">
- <fieldref>data_size</fieldref>
- </list>
- </request>
-
- <request name="ShmPutImage" opcode="19">
- <field type="PORT" name="port" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="SEG" name="shmseg" />
- <field type="CARD32" name="id" />
- <field type="CARD32" name="offset" />
- <field type="INT16" name="src_x" />
- <field type="INT16" name="src_y" />
- <field type="CARD16" name="src_w" />
- <field type="CARD16" name="src_h" />
- <field type="INT16" name="drw_x" />
- <field type="INT16" name="drw_y" />
- <field type="CARD16" name="drw_w" />
- <field type="CARD16" name="drw_h" />
- <field type="CARD16" name="width" />
- <field type="CARD16" name="height" />
- <field type="CARD8" name="send_event" />
- </request>
+ <pad bytes="22"/>
+ <list type="EncodingInfo" name="info">
+ <fieldref>num_encodings</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="GrabPort" opcode="3">
+ <field type="PORT" name="port"/>
+ <field type="TIMESTAMP" name="time"/>
+ <reply>
+ <field type="BYTE" name="result"/>
+ </reply>
+ </request>
+ <request name="UngrabPort" opcode="4">
+ <field type="PORT" name="port"/>
+ <field type="TIMESTAMP" name="time"/>
+ </request>
+ <request name="PutVideo" opcode="5">
+ <field type="PORT" name="port"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="INT16" name="vid_x"/>
+ <field type="INT16" name="vid_y"/>
+ <field type="CARD16" name="vid_w"/>
+ <field type="CARD16" name="vid_h"/>
+ <field type="INT16" name="drw_x"/>
+ <field type="INT16" name="drw_y"/>
+ <field type="CARD16" name="drw_w"/>
+ <field type="CARD16" name="drw_h"/>
+ </request>
+ <request name="PutStill" opcode="6">
+ <field type="PORT" name="port"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="INT16" name="vid_x"/>
+ <field type="INT16" name="vid_y"/>
+ <field type="CARD16" name="vid_w"/>
+ <field type="CARD16" name="vid_h"/>
+ <field type="INT16" name="drw_x"/>
+ <field type="INT16" name="drw_y"/>
+ <field type="CARD16" name="drw_w"/>
+ <field type="CARD16" name="drw_h"/>
+ </request>
+ <request name="GetVideo" opcode="7">
+ <field type="PORT" name="port"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="INT16" name="vid_x"/>
+ <field type="INT16" name="vid_y"/>
+ <field type="CARD16" name="vid_w"/>
+ <field type="CARD16" name="vid_h"/>
+ <field type="INT16" name="drw_x"/>
+ <field type="INT16" name="drw_y"/>
+ <field type="CARD16" name="drw_w"/>
+ <field type="CARD16" name="drw_h"/>
+ </request>
+ <request name="GetStill" opcode="8">
+ <field type="PORT" name="port"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="INT16" name="vid_x"/>
+ <field type="INT16" name="vid_y"/>
+ <field type="CARD16" name="vid_w"/>
+ <field type="CARD16" name="vid_h"/>
+ <field type="INT16" name="drw_x"/>
+ <field type="INT16" name="drw_y"/>
+ <field type="CARD16" name="drw_w"/>
+ <field type="CARD16" name="drw_h"/>
+ </request>
+ <request name="StopVideo" opcode="9">
+ <field type="PORT" name="port"/>
+ <field type="DRAWABLE" name="drawable"/>
+ </request>
+ <request name="SelectVideoNotify" opcode="10">
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="BOOL" name="onoff"/>
+ </request>
+ <request name="SelectPortNotify" opcode="11">
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="BOOL" name="onoff"/>
+ </request>
+ <request name="QueryBestSize" opcode="12">
+ <field type="PORT" name="port"/>
+ <field type="CARD16" name="vid_w"/>
+ <field type="CARD16" name="vid_h"/>
+ <field type="CARD16" name="drw_w"/>
+ <field type="CARD16" name="drw_h"/>
+ <field type="BOOL" name="motion"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="SIZE" name="actual_size"/>
+ </reply>
+ </request>
+ <request name="SetPortAttribute" opcode="13">
+ <field type="PORT" name="port"/>
+ <field type="ATOM" name="attribute"/>
+ <field type="INT32" name="value"/>
+ </request>
+ <request name="GetPortAttribute" opcode="14">
+ <field type="PORT" name="port"/>
+ <field type="ATOM" name="attribute"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="INT32" name="value"/>
+ </reply>
+ </request>
+<!-- Not in the docs beyond this point :( -->
+ <request name="QueryPortAttributes" opcode="15">
+ <field type="PORT" name="port"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_attributes"/>
+ <field type="CARD32" name="text_size"/>
+ <pad bytes="16"/>
+ <list type="AttributeInfo" name="attributes">
+ <fieldref>num_attributes</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="ListImageFormats" opcode="16">
+ <field type="PORT" name="port"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_formats"/>
+ <pad bytes="20"/>
+ <list type="ImageFormatInfo" name="format">
+ <fieldref>num_formats</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="QueryImageAttributes" opcode="17">
+ <field type="PORT" name="port"/>
+ <field type="CARD32" name="id"/>
+ <field type="SIZE"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="num_planes"/>
+ <field type="CARD32" name="data_size"/>
+ <field type="SIZE"/>
+ <pad bytes="12"/>
+ <list type="CARD32" name="pitches">
+ <fieldref>num_planes</fieldref>
+ </list>
+ <list type="CARD32" name="offsets">
+ <fieldref>num_planes</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="PutImage" opcode="18">
+ <field type="PORT" name="port"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="CARD32" name="id"/>
+ <field type="INT16" name="src_x"/>
+ <field type="INT16" name="src_y"/>
+ <field type="CARD16" name="src_w"/>
+ <field type="CARD16" name="src_h"/>
+ <field type="INT16" name="drw_x"/>
+ <field type="INT16" name="drw_y"/>
+ <field type="CARD16" name="drw_w"/>
+ <field type="CARD16" name="drw_h"/>
+ <field type="CARD16" name="width"/>
+ <field type="CARD16" name="height"/>
+ <localfield type="CARD32" name="data_size"/>
+ <list type="CARD8" name="data">
+ <fieldref>data_size</fieldref>
+ </list>
+ </request>
+ <request name="ShmPutImage" opcode="19">
+ <field type="PORT" name="port"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="SEG" name="shmseg"/>
+ <field type="CARD32" name="id"/>
+ <field type="CARD32" name="offset"/>
+ <field type="INT16" name="src_x"/>
+ <field type="INT16" name="src_y"/>
+ <field type="CARD16" name="src_w"/>
+ <field type="CARD16" name="src_h"/>
+ <field type="INT16" name="drw_x"/>
+ <field type="INT16" name="drw_y"/>
+ <field type="CARD16" name="drw_w"/>
+ <field type="CARD16" name="drw_h"/>
+ <field type="CARD16" name="width"/>
+ <field type="CARD16" name="height"/>
+ <field type="CARD8" name="send_event"/>
+ </request>
</xcb>
diff --git a/xcb-proto/src/extensions/xvmc.xml b/xcb-proto/src/extensions/xvmc.xml
index e2eb04d..273cd85 100644
--- a/xcb-proto/src/extensions/xvmc.xml
+++ b/xcb-proto/src/extensions/xvmc.xml
@@ -25,116 +25,103 @@ 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">
- <import>xv</import>
-
- <xidtype name="CONTEXT" />
- <xidtype name="SURFACE" />
- <xidtype name="SUBPICTURE" />
-
- <struct name="SurfaceInfo">
- <field type="SURFACE" name="id" />
- <field type="CARD16" name="chroma_format" />
- <field type="CARD16" name="pad0" />
- <field type="CARD16" name="max_width" />
- <field type="CARD16" name="max_height" />
- <field type="CARD16" name="subpicture_max_width" />
- <field type="CARD16" name="subpicture_max_height" />
- <field type="CARD32" name="mc_type" />
- <field type="CARD32" name="flags" />
- </struct>
-
- <request name="QueryVersion" opcode="0">
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="major" />
- <field type="CARD32" name="minor" />
- </reply>
- </request>
-
- <request name="ListSurfaceTypes" opcode="1">
- <field type="PORT" name="port_id" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="num" />
- <pad bytes="20" />
- <list type="SurfaceInfo" name="surfaces">
- <fieldref>num</fieldref>
- </list>
- </reply>
- </request>
-
- <request name="CreateContext" opcode="2">
- <field type="CONTEXT" name="context_id" />
- <field type="PORT" name="port_id" />
- <field type="SURFACE" name="surface_id" />
- <field type="CARD16" name="width" />
- <field type="CARD16" name="height" />
- <field type="CARD32" name="flags" />
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="width_actual" />
- <field type="CARD16" name="height_actual" />
- <field type="CARD32" name="flags_return" />
- <pad bytes="20" />
- <list type="CARD32" name="priv_data" />
- </reply>
- </request>
-
- <request name="DestroyContext" opcode="3">
- <field type="CONTEXT" name="context_id" />
- </request>
-
- <request name="CreateSurface" opcode="4">
- <field type="SURFACE" name="surface_id" />
- <field type="CONTEXT" name="context_id" />
- <reply>
- <pad bytes="1" />
- <pad bytes="24" />
- <list type="CARD32" name="priv_data" />
- </reply>
- </request>
-
- <request name="DestroySurface" opcode="5">
- <field type="SURFACE" name="surface_id" />
- </request>
-
- <request name="CreateSubpicture" opcode="6">
- <field type="SUBPICTURE" name="subpicture_id" />
- <field type="CONTEXT" name="context" />
- <field type="CARD32" name="xvimage_id" />
- <field type="CARD16" name="width" />
- <field type="CARD16" name="height" />
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="width_actual" />
- <field type="CARD16" name="height_actual" />
- <field type="CARD16" name="num_palette_entries" />
- <field type="CARD16" name="entry_bytes" />
- <list type="CARD8" name="component_order">
- <value>4</value>
- </list>
- <pad bytes="12" />
- <list type="CARD32" name="priv_data" />
- </reply>
- </request>
-
- <request name="DestroySubpicture" opcode="7">
- <field type="SUBPICTURE" name="subpicture_id" />
- </request>
-
- <request name="ListSubpictureTypes" opcode="8">
- <field type="PORT" name="port_id" />
- <field type="SURFACE" name="surface_id" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="num" />
- <pad bytes="20" />
- <list type="ImageFormatInfo" name="types">
- <fieldref>num</fieldref>
- </list>
- </reply>
- </request>
-
-</xcb>
+ <import>xv</import>
+ <xidtype name="CONTEXT"/>
+ <xidtype name="SURFACE"/>
+ <xidtype name="SUBPICTURE"/>
+ <struct name="SurfaceInfo">
+ <field type="SURFACE" name="id"/>
+ <field type="CARD16" name="chroma_format"/>
+ <field type="CARD16" name="pad0"/>
+ <field type="CARD16" name="max_width"/>
+ <field type="CARD16" name="max_height"/>
+ <field type="CARD16" name="subpicture_max_width"/>
+ <field type="CARD16" name="subpicture_max_height"/>
+ <field type="CARD32" name="mc_type"/>
+ <field type="CARD32" name="flags"/>
+ </struct>
+ <request name="QueryVersion" opcode="0">
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="major"/>
+ <field type="CARD32" name="minor"/>
+ </reply>
+ </request>
+ <request name="ListSurfaceTypes" opcode="1">
+ <field type="PORT" name="port_id"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="num"/>
+ <pad bytes="20"/>
+ <list type="SurfaceInfo" name="surfaces">
+ <fieldref>num</fieldref>
+ </list>
+ </reply>
+ </request>
+ <request name="CreateContext" opcode="2">
+ <field type="CONTEXT" name="context_id"/>
+ <field type="PORT" name="port_id"/>
+ <field type="SURFACE" name="surface_id"/>
+ <field type="CARD16" name="width"/>
+ <field type="CARD16" name="height"/>
+ <field type="CARD32" name="flags"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="width_actual"/>
+ <field type="CARD16" name="height_actual"/>
+ <field type="CARD32" name="flags_return"/>
+ <pad bytes="20"/>
+ <list type="CARD32" name="priv_data"/>
+ </reply>
+ </request>
+ <request name="DestroyContext" opcode="3">
+ <field type="CONTEXT" name="context_id"/>
+ </request>
+ <request name="CreateSurface" opcode="4">
+ <field type="SURFACE" name="surface_id"/>
+ <field type="CONTEXT" name="context_id"/>
+ <reply>
+ <pad bytes="1"/>
+ <pad bytes="24"/>
+ <list type="CARD32" name="priv_data"/>
+ </reply>
+ </request>
+ <request name="DestroySurface" opcode="5">
+ <field type="SURFACE" name="surface_id"/>
+ </request>
+ <request name="CreateSubpicture" opcode="6">
+ <field type="SUBPICTURE" name="subpicture_id"/>
+ <field type="CONTEXT" name="context"/>
+ <field type="CARD32" name="xvimage_id"/>
+ <field type="CARD16" name="width"/>
+ <field type="CARD16" name="height"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="width_actual"/>
+ <field type="CARD16" name="height_actual"/>
+ <field type="CARD16" name="num_palette_entries"/>
+ <field type="CARD16" name="entry_bytes"/>
+ <list type="CARD8" name="component_order">
+ <value>4</value>
+ </list>
+ <pad bytes="12"/>
+ <list type="CARD32" name="priv_data"/>
+ </reply>
+ </request>
+ <request name="DestroySubpicture" opcode="7">
+ <field type="SUBPICTURE" name="subpicture_id"/>
+ </request>
+ <request name="ListSubpictureTypes" opcode="8">
+ <field type="PORT" name="port_id"/>
+ <field type="SURFACE" name="surface_id"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="num"/>
+ <pad bytes="20"/>
+ <list type="ImageFormatInfo" name="types">
+ <fieldref>num</fieldref>
+ </list>
+ </reply>
+ </request>
+</xcb>
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index 24d9b7c..5b1dfaf 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.xml
@@ -26,150 +26,122 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<xcb header="xcb_types">
- <!-- Core protocol types -->
-
+<!-- Core protocol types -->
<struct name="CHAR2B">
- <field type="CARD8" name="byte1" />
- <field type="CARD8" name="byte2" />
+ <field type="CARD8" name="byte1"/>
+ <field type="CARD8" name="byte2"/>
</struct>
-
- <xidtype name="WINDOW" />
-
- <xidtype name="PIXMAP" />
-
- <xidtype name="CURSOR" />
-
- <xidtype name="FONT" />
-
- <xidtype name="GCONTEXT" />
-
- <xidtype name="COLORMAP" />
-
- <xidtype name="ATOM" />
-
+ <xidtype name="WINDOW"/>
+ <xidtype name="PIXMAP"/>
+ <xidtype name="CURSOR"/>
+ <xidtype name="FONT"/>
+ <xidtype name="GCONTEXT"/>
+ <xidtype name="COLORMAP"/>
+ <xidtype name="ATOM"/>
<union name="DRAWABLE">
- <field type="WINDOW" name="window" />
- <field type="PIXMAP" name="pixmap" />
+ <field type="WINDOW" name="window"/>
+ <field type="PIXMAP" name="pixmap"/>
</union>
-
<union name="FONTABLE">
- <field type="FONT" name="font" />
- <field type="GCONTEXT" name="gcontext" />
+ <field type="FONT" name="font"/>
+ <field type="GCONTEXT" name="gcontext"/>
</union>
-
- <struct name="VERSION">
- <field type="CARD16" name="major" />
- <field type="CARD16" name="minor" />
- </struct>
-
+ <struct name="VERSION">
+ <field type="CARD16" name="major"/>
+ <field type="CARD16" name="minor"/>
+ </struct>
<struct name="VISUALID">
- <field type="CARD32" name="id" />
+ <field type="CARD32" name="id"/>
</struct>
-
<struct name="TIMESTAMP">
- <field type="CARD32" name="id" />
+ <field type="CARD32" name="id"/>
</struct>
-
<struct name="KEYSYM">
- <field type="CARD32" name="id" />
+ <field type="CARD32" name="id"/>
</struct>
-
<struct name="KEYCODE">
- <field type="CARD8" name="id" />
+ <field type="CARD8" name="id"/>
</struct>
-
<struct name="BUTTON">
- <field type="CARD8" name="id" />
+ <field type="CARD8" name="id"/>
</struct>
-
<struct name="POINT">
- <field type="INT16" name="x" />
- <field type="INT16" name="y" />
+ <field type="INT16" name="x"/>
+ <field type="INT16" name="y"/>
</struct>
-
<struct name="SIZE">
- <field type="CARD16" name="width" />
- <field type="CARD16" name="height" />
+ <field type="CARD16" name="width"/>
+ <field type="CARD16" name="height"/>
</struct>
-
<struct name="RECTANGLE">
- <field type="POINT" />
- <field type="SIZE" />
+ <field type="POINT"/>
+ <field type="SIZE"/>
</struct>
-
<struct name="ARC">
- <field type="RECTANGLE" />
- <field type="INT16" name="angle1" />
- <field type="INT16" name="angle2" />
- </struct>
-
- <!-- Connection setup-related types -->
-
+ <field type="RECTANGLE"/>
+ <field type="INT16" name="angle1"/>
+ <field type="INT16" name="angle2"/>
+ </struct>
+<!-- Connection setup-related types -->
<struct name="FORMAT">
- <field type="CARD8" name="depth" />
- <field type="CARD8" name="bits_per_pixel" />
- <field type="CARD8" name="scanline_pad" />
- <pad bytes="5" />
+ <field type="CARD8" name="depth"/>
+ <field type="CARD8" name="bits_per_pixel"/>
+ <field type="CARD8" name="scanline_pad"/>
+ <pad bytes="5"/>
</struct>
-
<struct name="VISUALTYPE">
- <field type="VISUALID" name="visual_id" />
- <field type="CARD8" name="class" />
- <field type="CARD8" name="bits_per_rgb_value" />
- <field type="CARD16" name="colormap_entries" />
- <field type="CARD32" name="red_mask" />
- <field type="CARD32" name="green_mask" />
- <field type="CARD32" name="blue_mask" />
- <pad bytes="4" />
+ <field type="VISUALID" name="visual_id"/>
+ <field type="CARD8" name="class"/>
+ <field type="CARD8" name="bits_per_rgb_value"/>
+ <field type="CARD16" name="colormap_entries"/>
+ <field type="CARD32" name="red_mask"/>
+ <field type="CARD32" name="green_mask"/>
+ <field type="CARD32" name="blue_mask"/>
+ <pad bytes="4"/>
</struct>
-
<struct name="DEPTH">
- <field type="CARD8" name="depth" />
- <pad bytes="1" />
- <field type="CARD16" name="visuals_len" />
- <pad bytes="4" />
+ <field type="CARD8" name="depth"/>
+ <pad bytes="1"/>
+ <field type="CARD16" name="visuals_len"/>
+ <pad bytes="4"/>
<list type="VISUALTYPE" name="visuals">
<fieldref>visuals_len</fieldref>
</list>
</struct>
-
- <struct name="ScreenSize">
- <field type="SIZE" name="size_in_pixels" />
- <field type="SIZE" name="size_in_millimeters" />
- </struct>
-
+ <struct name="ScreenSize">
+ <field type="SIZE" name="size_in_pixels"/>
+ <field type="SIZE" name="size_in_millimeters"/>
+ </struct>
<struct name="SCREEN">
- <field type="WINDOW" name="root" />
- <field type="COLORMAP" name="default_colormap" />
- <field type="CARD32" name="white_pixel" />
- <field type="CARD32" name="black_pixel" />
- <field type="CARD32" name="current_input_masks" />
- <field type="ScreenSize" />
- <field type="CARD16" name="min_installed_maps" />
- <field type="CARD16" name="max_installed_maps" />
- <field type="VISUALID" name="root_visual" />
- <field type="BYTE" name="backing_stores" />
- <field type="BOOL" name="save_unders" />
- <field type="CARD8" name="root_depth" />
- <field type="CARD8" name="allowed_depths_len" />
+ <field type="WINDOW" name="root"/>
+ <field type="COLORMAP" name="default_colormap"/>
+ <field type="CARD32" name="white_pixel"/>
+ <field type="CARD32" name="black_pixel"/>
+ <field type="CARD32" name="current_input_masks"/>
+ <field type="ScreenSize"/>
+ <field type="CARD16" name="min_installed_maps"/>
+ <field type="CARD16" name="max_installed_maps"/>
+ <field type="VISUALID" name="root_visual"/>
+ <field type="BYTE" name="backing_stores"/>
+ <field type="BOOL" name="save_unders"/>
+ <field type="CARD8" name="root_depth"/>
+ <field type="CARD8" name="allowed_depths_len"/>
<list type="DEPTH" name="allowed_depths">
<fieldref>allowed_depths_len</fieldref>
</list>
</struct>
-
- <!--
+<!--
<struct name="AuthInfo">
<field type="string" name="name" />
<field type="" name="data" />
</struct>
-->
-
<struct name="ConnSetupReq">
- <field type="CARD8" name="byte_order" />
- <pad bytes="1" />
- <field type="VERSION" name="protocol_version" />
- <field type="CARD16" name="authorization_protocol_name_len" />
- <field type="CARD16" name="authorization_protocol_data_len" />
+ <field type="CARD8" name="byte_order"/>
+ <pad bytes="1"/>
+ <field type="VERSION" name="protocol_version"/>
+ <field type="CARD16" name="authorization_protocol_name_len"/>
+ <field type="CARD16" name="authorization_protocol_data_len"/>
<list type="char" name="authorization_protocol_name">
<fieldref>authorization_protocol_name_len</fieldref>
</list>
@@ -177,43 +149,42 @@ authorization from the authors.
<fieldref>authorization_protocol_data_len</fieldref>
</list>
</struct>
-
<struct name="ConnSetupGenericRep">
- <field type="CARD8" name="status" />
- <pad bytes="5" />
- <field type="CARD16" name="length" />
+ <field type="CARD8" name="status"/>
+ <pad bytes="5"/>
+ <field type="CARD16" name="length"/>
</struct>
-
<struct name="ConnSetupFailedRep">
- <field type="CARD8" name="status" /> <!-- always 0 -> Failed -->
- <field type="CARD8" name="reason_len" />
- <field type="VERSION" name="protocol_version" />
- <field type="CARD16" name="length" />
+<!-- always 0 -> Failed -->
+ <field type="CARD8" name="status"/>
+ <field type="CARD8" name="reason_len"/>
+ <field type="VERSION" name="protocol_version"/>
+ <field type="CARD16" name="length"/>
<list type="char" name="reason">
<fieldref>reason_len</fieldref>
</list>
</struct>
-
<struct name="ConnSetupSuccessRep">
- <field type="CARD8" name="status" /> <!-- always 1 -> Success -->
- <pad bytes="1" />
- <field type="VERSION" name="protocol_version" />
- <field type="CARD16" name="length" />
- <field type="CARD32" name="release_number" />
- <field type="CARD32" name="resource_id_base" />
- <field type="CARD32" name="resource_id_mask" />
- <field type="CARD32" name="motion_buffer_size" />
- <field type="CARD16" name="vendor_len" />
- <field type="CARD16" name="maximum_request_length" />
- <field type="CARD8" name="roots_len" />
- <field type="CARD8" name="pixmap_formats_len" />
- <field type="CARD8" name="image_byte_order" />
- <field type="CARD8" name="bitmap_format_bit_order" />
- <field type="CARD8" name="bitmap_format_scanline_unit" />
- <field type="CARD8" name="bitmap_format_scanline_pad" />
- <field type="KEYCODE" name="min_keycode" />
- <field type="KEYCODE" name="max_keycode" />
- <pad bytes="4" />
+<!-- always 1 -> Success -->
+ <field type="CARD8" name="status"/>
+ <pad bytes="1"/>
+ <field type="VERSION" name="protocol_version"/>
+ <field type="CARD16" name="length"/>
+ <field type="CARD32" name="release_number"/>
+ <field type="CARD32" name="resource_id_base"/>
+ <field type="CARD32" name="resource_id_mask"/>
+ <field type="CARD32" name="motion_buffer_size"/>
+ <field type="CARD16" name="vendor_len"/>
+ <field type="CARD16" name="maximum_request_length"/>
+ <field type="CARD8" name="roots_len"/>
+ <field type="CARD8" name="pixmap_formats_len"/>
+ <field type="CARD8" name="image_byte_order"/>
+ <field type="CARD8" name="bitmap_format_bit_order"/>
+ <field type="CARD8" name="bitmap_format_scanline_unit"/>
+ <field type="CARD8" name="bitmap_format_scanline_pad"/>
+ <field type="KEYCODE" name="min_keycode"/>
+ <field type="KEYCODE" name="max_keycode"/>
+ <pad bytes="4"/>
<list type="char" name="vendor">
<fieldref>vendor_len</fieldref>
</list>
@@ -224,11 +195,11 @@ authorization from the authors.
<fieldref>roots_len</fieldref>
</list>
</struct>
-
<struct name="ConnSetupAuthenticateRep">
- <field type="CARD8" name="status" /> <!-- always 2 -> Authenticate -->
- <pad bytes="5" />
- <field type="CARD16" name="length" />
+<!-- always 2 -> Authenticate -->
+ <field type="CARD8" name="status"/>
+ <pad bytes="5"/>
+ <field type="CARD16" name="length"/>
<list type="char" name="reason">
<op op="*">
<fieldref>length</fieldref>
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index edf0afd..645ba97 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -26,513 +26,504 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<xcb header="xproto">
- <!-- Core event and error types -->
-
+<!-- Core event and error 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="CARD16" name="state" />
- <field type="BOOL" name="same_screen" />
- </event>
-
- <eventcopy name="KeyRelease" number="3" ref="KeyPress" />
-
+ <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="CARD16" name="state"/>
+ <field type="BOOL" name="same_screen"/>
+ </event>
+ <eventcopy name="KeyRelease" number="3" ref="KeyPress"/>
<event name="ButtonPress" number="4">
- <field type="BUTTON" 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="CARD16" name="state" />
- <field type="BOOL" name="same_screen" />
- </event>
-
- <eventcopy name="ButtonRelease" number="5" ref="ButtonPress" />
-
+ <field type="BUTTON" 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="CARD16" name="state"/>
+ <field type="BOOL" name="same_screen"/>
+ </event>
+ <eventcopy name="ButtonRelease" number="5" ref="ButtonPress"/>
<event name="MotionNotify" number="6">
- <field type="BYTE" 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="CARD16" name="state" />
- <field type="BOOL" name="same_screen" />
+ <field type="BYTE" 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="CARD16" name="state"/>
+ <field type="BOOL" name="same_screen"/>
</event>
-
<event name="EnterNotify" number="7">
- <field type="BYTE" 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="CARD16" name="state" />
- <field type="BYTE" name="mode" />
- <field type="BYTE" name="same_screen_focus" />
- </event>
-
- <eventcopy name="LeaveNotify" number="8" ref="EnterNotify" />
-
+ <field type="BYTE" 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="CARD16" name="state"/>
+ <field type="BYTE" name="mode"/>
+ <field type="BYTE" name="same_screen_focus"/>
+ </event>
+ <eventcopy name="LeaveNotify" number="8" ref="EnterNotify"/>
<event name="FocusIn" number="9">
- <field type="BYTE" name="detail" />
- <field type="WINDOW" name="event" />
- <field type="BYTE" name="mode" />
- </event>
-
- <eventcopy name="FocusOut" number="10" ref="FocusIn" />
-
+ <field type="BYTE" name="detail"/>
+ <field type="WINDOW" name="event"/>
+ <field type="BYTE" name="mode"/>
+ </event>
+ <eventcopy name="FocusOut" number="10" ref="FocusIn"/>
<event name="KeymapNotify" number="11" no-sequence-number="true">
- <list type="CARD8" name="keys"><value>31</value></list>
+ <list type="CARD8" name="keys">
+ <value>31</value>
+ </list>
</event>
-
<event name="Expose" number="12">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
- <!-- FIXME: type change -->
- <field type="RECTANGLE" />
- <field type="CARD16" name="count" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
+<!-- FIXME: type change -->
+ <field type="RECTANGLE"/>
+ <field type="CARD16" name="count"/>
</event>
-
<event name="GraphicsExposure" number="13">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
- <!-- FIXME: type change -->
- <field type="RECTANGLE" />
- <field type="CARD16" name="minor_opcode" />
- <field type="CARD16" name="count" />
- <field type="CARD8" name="major_opcode" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
+<!-- FIXME: type change -->
+ <field type="RECTANGLE"/>
+ <field type="CARD16" name="minor_opcode"/>
+ <field type="CARD16" name="count"/>
+ <field type="CARD8" name="major_opcode"/>
</event>
-
<event name="NoExposure" number="14">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
- <field type="CARD16" name="minor_opcode" />
- <field type="CARD8" name="major_opcode" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="CARD16" name="minor_opcode"/>
+ <field type="CARD8" name="major_opcode"/>
</event>
-
<event name="VisibilityNotify" number="15">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
- <field type="BYTE" name="state" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
+ <field type="BYTE" name="state"/>
</event>
-
<event name="CreateNotify" number="16">
- <pad bytes="1" />
- <field type="WINDOW" name="parent" />
- <field type="WINDOW" name="window" />
- <field type="RECTANGLE" />
- <field type="CARD16" name="border_width" />
- <field type="BOOL" name="override_redirect" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="parent"/>
+ <field type="WINDOW" name="window"/>
+ <field type="RECTANGLE"/>
+ <field type="CARD16" name="border_width"/>
+ <field type="BOOL" name="override_redirect"/>
</event>
-
<event name="DestroyNotify" number="17">
- <pad bytes="1" />
- <field type="WINDOW" name="event" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="event"/>
+ <field type="WINDOW" name="window"/>
</event>
-
<event name="UnmapNotify" number="18">
- <pad bytes="1" />
- <field type="WINDOW" name="event" />
- <field type="WINDOW" name="window" />
- <field type="BOOL" name="from_configure" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="event"/>
+ <field type="WINDOW" name="window"/>
+ <field type="BOOL" name="from_configure"/>
</event>
-
<event name="MapNotify" number="19">
- <pad bytes="1" />
- <field type="WINDOW" name="event" />
- <field type="WINDOW" name="window" />
- <field type="BOOL" name="override_redirect" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="event"/>
+ <field type="WINDOW" name="window"/>
+ <field type="BOOL" name="override_redirect"/>
</event>
-
<event name="MapRequest" number="20">
- <pad bytes="1" />
- <field type="WINDOW" name="parent" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="parent"/>
+ <field type="WINDOW" name="window"/>
</event>
-
<event name="ReparentNotify" number="21">
- <pad bytes="1" />
- <field type="WINDOW" name="event" />
- <field type="WINDOW" name="window" />
- <field type="WINDOW" name="parent" />
- <field type="POINT" />
- <field type="BOOL" name="override_redirect" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="event"/>
+ <field type="WINDOW" name="window"/>
+ <field type="WINDOW" name="parent"/>
+ <field type="POINT"/>
+ <field type="BOOL" name="override_redirect"/>
</event>
-
<event name="ConfigureNotify" number="22">
- <pad bytes="1" />
- <field type="WINDOW" name="event" />
- <field type="WINDOW" name="window" />
- <field type="WINDOW" name="above_sibling" />
- <field type="RECTANGLE" />
- <field type="CARD16" name="border_width" />
- <field type="BOOL" name="override_redirect" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="event"/>
+ <field type="WINDOW" name="window"/>
+ <field type="WINDOW" name="above_sibling"/>
+ <field type="RECTANGLE"/>
+ <field type="CARD16" name="border_width"/>
+ <field type="BOOL" name="override_redirect"/>
</event>
-
<event name="ConfigureRequest" number="23">
- <field type="BYTE" name="stack_mode" />
- <field type="WINDOW" name="parent" />
- <field type="WINDOW" name="window" />
- <field type="WINDOW" name="sibling" />
- <field type="RECTANGLE" />
- <field type="CARD16" name="border_width" />
- <field type="CARD16" name="value_mask" />
+ <field type="BYTE" name="stack_mode"/>
+ <field type="WINDOW" name="parent"/>
+ <field type="WINDOW" name="window"/>
+ <field type="WINDOW" name="sibling"/>
+ <field type="RECTANGLE"/>
+ <field type="CARD16" name="border_width"/>
+ <field type="CARD16" name="value_mask"/>
</event>
-
<event name="GravityNotify" number="24">
- <pad bytes="1" />
- <field type="WINDOW" name="event" />
- <field type="WINDOW" name="window" />
- <field type="POINT" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="event"/>
+ <field type="WINDOW" name="window"/>
+ <field type="POINT"/>
</event>
-
<event name="ResizeRequest" number="25">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
- <field type="SIZE" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
+ <field type="SIZE"/>
</event>
-
<event name="CirculateNotify" number="26">
- <pad bytes="1" />
- <field type="WINDOW" name="event" />
- <field type="WINDOW" name="window" />
- <pad bytes="4" />
- <field type="BYTE" name="place" />
- </event>
-
- <eventcopy name="CirculateRequest" number="27" ref="CirculateNotify" />
-
+ <pad bytes="1"/>
+ <field type="WINDOW" name="event"/>
+ <field type="WINDOW" name="window"/>
+ <pad bytes="4"/>
+ <field type="BYTE" name="place"/>
+ </event>
+ <eventcopy name="CirculateRequest" number="27" ref="CirculateNotify"/>
<event name="PropertyNotify" number="28">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
- <field type="ATOM" name="atom" />
- <field type="TIMESTAMP" name="time" />
- <field type="BYTE" name="state" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
+ <field type="ATOM" name="atom"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="BYTE" name="state"/>
</event>
-
<event name="SelectionClear" number="29">
- <pad bytes="1" />
- <field type="TIMESTAMP" name="time" />
- <field type="WINDOW" name="owner" />
- <field type="ATOM" name="selection" />
+ <pad bytes="1"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="WINDOW" name="owner"/>
+ <field type="ATOM" name="selection"/>
</event>
-
<event name="SelectionRequest" number="30">
- <pad bytes="1" />
- <field type="TIMESTAMP" name="time" />
- <field type="WINDOW" name="owner" />
- <field type="WINDOW" name="requestor" />
- <field type="ATOM" name="selection" />
- <field type="ATOM" name="target" />
- <field type="ATOM" name="property" />
+ <pad bytes="1"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="WINDOW" name="owner"/>
+ <field type="WINDOW" name="requestor"/>
+ <field type="ATOM" name="selection"/>
+ <field type="ATOM" name="target"/>
+ <field type="ATOM" name="property"/>
</event>
-
<event name="SelectionNotify" number="31">
- <pad bytes="1" />
- <field type="TIMESTAMP" name="time" />
- <field type="WINDOW" name="requestor" />
- <field type="ATOM" name="selection" />
- <field type="ATOM" name="target" />
- <field type="ATOM" name="property" />
+ <pad bytes="1"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="WINDOW" name="requestor"/>
+ <field type="ATOM" name="selection"/>
+ <field type="ATOM" name="target"/>
+ <field type="ATOM" name="property"/>
</event>
-
<event name="ColormapNotify" number="32">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
- <field type="COLORMAP" name="colormap" />
- <field type="BOOL" name="new" />
- <field type="BYTE" name="state" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
+ <field type="COLORMAP" name="colormap"/>
+ <field type="BOOL" name="new"/>
+ <field type="BYTE" name="state"/>
</event>
-
<union name="ClientMessageData">
- <!-- The format member of the ClientMessage event determines which array
+<!-- The format member of the ClientMessage event determines which array
to use. -->
- <list type="CARD8" name="data8" ><value>20</value></list> <!-- 8 -->
- <list type="CARD16" name="data16"><value>10</value></list> <!-- 16 -->
- <list type="CARD32" name="data32"><value>5</value></list> <!-- 32 -->
+ <list type="CARD8" name="data8">
+ <value>20</value>
+ </list>
+<!-- 8 -->
+ <list type="CARD16" name="data16">
+ <value>10</value>
+ </list>
+<!-- 16 -->
+ <list type="CARD32" name="data32">
+ <value>5</value>
+ </list>
+<!-- 32 -->
</union>
-
<event name="ClientMessage" number="33">
- <field type="CARD8" name="format" /> <!-- 8, 16, or 32. -->
- <field type="WINDOW" name="window" />
- <field type="ATOM" name="type" />
- <field type="ClientMessageData" name="data" />
+ <field type="CARD8" name="format"/>
+<!-- 8, 16, or 32. -->
+ <field type="WINDOW" name="window"/>
+ <field type="ATOM" name="type"/>
+ <field type="ClientMessageData" name="data"/>
</event>
-
<event name="MappingNotify" number="34">
- <pad bytes="1" />
- <field type="BYTE" name="request" />
- <field type="KEYCODE" name="first_keycode" />
- <field type="CARD8" name="count" />
+ <pad bytes="1"/>
+ <field type="BYTE" name="request"/>
+ <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" />
+ <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" />
+ <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. -->
-
- <!-- Window attributes for CreateWindow and ChangeWindowAttributes. -->
+ <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. -->
+<!-- Window attributes for CreateWindow and ChangeWindowAttributes. -->
<enum name="CW">
<item name="BackPixmap">
- <op op="<<"><value>1</value><value>0</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>0</value>
+ </op>
</item>
<item name="BackPixel">
- <op op="<<"><value>1</value><value>1</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>1</value>
+ </op>
</item>
<item name="BorderPixmap">
- <op op="<<"><value>1</value><value>2</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>2</value>
+ </op>
</item>
<item name="BorderPixel">
- <op op="<<"><value>1</value><value>3</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>3</value>
+ </op>
</item>
<item name="BitGravity">
- <op op="<<"><value>1</value><value>4</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>4</value>
+ </op>
</item>
<item name="WinGravity">
- <op op="<<"><value>1</value><value>5</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>5</value>
+ </op>
</item>
<item name="BackingStore">
- <op op="<<"><value>1</value><value>6</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>6</value>
+ </op>
</item>
<item name="BackingPlanes">
- <op op="<<"><value>1</value><value>7</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>7</value>
+ </op>
</item>
<item name="BackingPixel">
- <op op="<<"><value>1</value><value>8</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>8</value>
+ </op>
</item>
<item name="OverrideRedirect">
- <op op="<<"><value>1</value><value>9</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>9</value>
+ </op>
</item>
<item name="SaveUnder">
- <op op="<<"><value>1</value><value>10</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>10</value>
+ </op>
</item>
<item name="EventMask">
- <op op="<<"><value>1</value><value>11</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>11</value>
+ </op>
</item>
<item name="DontPropagate">
- <op op="<<"><value>1</value><value>12</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>12</value>
+ </op>
</item>
<item name="Colormap">
- <op op="<<"><value>1</value><value>13</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>13</value>
+ </op>
</item>
<item name="Cursor">
- <op op="<<"><value>1</value><value>14</value></op>
+ <op op="<<">
+ <value>1</value>
+ <value>14</value>
+ </op>
</item>
</enum>
-
<request name="CreateWindow" opcode="1">
- <field type="CARD8" name="depth" />
- <field type="WINDOW" name="wid" />
- <field type="WINDOW" name="parent" />
- <field type="RECTANGLE" />
- <field type="CARD16" name="border_width" />
- <field type="CARD16" name="class" />
- <field type="VISUALID" name="visual" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <field type="CARD8" name="depth"/>
+ <field type="WINDOW" name="wid"/>
+ <field type="WINDOW" name="parent"/>
+ <field type="RECTANGLE"/>
+ <field type="CARD16" name="border_width"/>
+ <field type="CARD16" name="class"/>
+ <field type="VISUALID" name="visual"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
-
<request name="ChangeWindowAttributes" opcode="2">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
- </request>
-
-<struct name="WindowAttributes">
- <field type="CARD8" name="backing_store" />
- <field type="VISUALID" name="visual" />
- <field type="CARD16" name="class" />
- <field type="CARD8" name="bit_gravity" />
- <field type="CARD8" name="win_gravity" />
- <field type="CARD32" name="backing_planes" />
- <field type="CARD32" name="backing_pixel" />
- <field type="BOOL" name="save_under" />
- <field type="BOOL" name="map_is_installed" />
- <field type="CARD8" name="map_state" />
- <field type="BOOL" name="override_redirect" />
- <field type="COLORMAP" name="colormap" />
- <field type="CARD32" name="all_event_masks" />
- <field type="CARD32" name="your_event_mask" />
- <field type="CARD16" name="do_not_propagate_mask" />
-</struct>
-
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
+ </request>
+ <struct name="WindowAttributes">
+ <field type="CARD8" name="backing_store"/>
+ <field type="VISUALID" name="visual"/>
+ <field type="CARD16" name="class"/>
+ <field type="CARD8" name="bit_gravity"/>
+ <field type="CARD8" name="win_gravity"/>
+ <field type="CARD32" name="backing_planes"/>
+ <field type="CARD32" name="backing_pixel"/>
+ <field type="BOOL" name="save_under"/>
+ <field type="BOOL" name="map_is_installed"/>
+ <field type="CARD8" name="map_state"/>
+ <field type="BOOL" name="override_redirect"/>
+ <field type="COLORMAP" name="colormap"/>
+ <field type="CARD32" name="all_event_masks"/>
+ <field type="CARD32" name="your_event_mask"/>
+ <field type="CARD16" name="do_not_propagate_mask"/>
+ </struct>
<request name="GetWindowAttributes" opcode="3">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
<reply>
- <field type="WindowAttributes" name="value" />
+ <field type="WindowAttributes" name="value"/>
</reply>
</request>
-
<request name="DestroyWindow" opcode="4">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
</request>
-
<request name="DestroySubwindows" opcode="5">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
</request>
-
<request name="ChangeSaveSet" opcode="6">
- <field type="BYTE" name="mode" />
- <field type="WINDOW" name="window" />
+ <field type="BYTE" name="mode"/>
+ <field type="WINDOW" name="window"/>
</request>
-
<request name="ReparentWindow" opcode="7">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
- <field type="WINDOW" name="parent" />
- <field type="POINT" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
+ <field type="WINDOW" name="parent"/>
+ <field type="POINT"/>
</request>
-
<request name="MapWindow" opcode="8">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
</request>
-
<request name="MapSubwindows" opcode="9">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
</request>
-
<request name="UnmapWindow" opcode="10">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
</request>
-
<request name="UnmapSubwindows" opcode="11">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
</request>
-
<request name="ConfigureWindow" opcode="12">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
- <valueparam value-mask-type="CARD16"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
+ <valueparam value-mask-type="CARD16" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
-
<request name="CirculateWindow" opcode="13">
- <field type="CARD8" name="direction" />
- <field type="WINDOW" name="window" />
- </request>
-
- <struct name="Geometry">
- <field type="CARD8" name="depth" />
- <field type="WINDOW" name="root" />
- <field type="RECTANGLE" />
- <field type="CARD16" name="border_width" />
- </struct>
-
+ <field type="CARD8" name="direction"/>
+ <field type="WINDOW" name="window"/>
+ </request>
+ <struct name="Geometry">
+ <field type="CARD8" name="depth"/>
+ <field type="WINDOW" name="root"/>
+ <field type="RECTANGLE"/>
+ <field type="CARD16" name="border_width"/>
+ </struct>
<request name="GetGeometry" opcode="14">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
<reply>
- <field type="Geometry" />
+ <field type="Geometry"/>
</reply>
</request>
-
<request name="QueryTree" opcode="15">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
<reply>
- <pad bytes="1" />
- <field type="WINDOW" name="root" />
- <field type="WINDOW" name="parent" />
- <field type="CARD16" name="children_len" />
- <pad bytes="14" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="root"/>
+ <field type="WINDOW" name="parent"/>
+ <field type="CARD16" name="children_len"/>
+ <pad bytes="14"/>
<list type="WINDOW" name="children">
<fieldref>children_len</fieldref>
</list>
</reply>
</request>
-
<request name="InternAtom" opcode="16">
- <field type="BOOL" name="only_if_exists" />
- <field type="CARD16" name="name_len" />
- <pad bytes="2" />
+ <field type="BOOL" name="only_if_exists"/>
+ <field type="CARD16" name="name_len"/>
+ <pad bytes="2"/>
<list type="char" name="name">
<fieldref>name_len</fieldref>
</list>
<reply>
- <pad bytes="1" />
- <field type="ATOM" name="atom" />
+ <pad bytes="1"/>
+ <field type="ATOM" name="atom"/>
</reply>
</request>
-
<request name="GetAtomName" opcode="17">
- <pad bytes="1" />
- <field type="ATOM" name="atom" />
+ <pad bytes="1"/>
+ <field type="ATOM" name="atom"/>
<reply>
- <pad bytes="1" />
- <field type="CARD16" name="name_len" />
- <pad bytes="22" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="name_len"/>
+ <pad bytes="22"/>
<list type="CARD8" name="name">
<fieldref>name_len</fieldref>
</list>
</reply>
</request>
-
<request name="ChangeProperty" opcode="18">
- <field type="CARD8" name="mode" />
- <field type="WINDOW" name="window" />
- <field type="ATOM" name="property" />
- <field type="ATOM" name="type" />
- <field type="CARD8" name="format" />
- <pad bytes="3" />
- <field type="CARD32" name="data_len" />
+ <field type="CARD8" name="mode"/>
+ <field type="WINDOW" name="window"/>
+ <field type="ATOM" name="property"/>
+ <field type="ATOM" name="type"/>
+ <field type="CARD8" name="format"/>
+ <pad bytes="3"/>
+ <field type="CARD32" name="data_len"/>
<list type="void" name="data">
<op op="/">
<op op="*">
@@ -543,292 +534,264 @@ authorization from the authors.
</op>
</list>
</request>
-
<request name="DeleteProperty" opcode="19">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
- <field type="ATOM" name="property" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
+ <field type="ATOM" name="property"/>
</request>
-
<request name="GetProperty" opcode="20">
- <field type="BOOL" name="delete" />
- <field type="WINDOW" name="window" />
- <field type="ATOM" name="property" />
- <field type="ATOM" name="type" />
- <field type="CARD32" name="long_offset" />
- <field type="CARD32" name="long_length" />
- <reply>
- <field type="CARD8" name="format" />
- <field type="ATOM" name="type" />
- <field type="CARD32" name="bytes_after" />
- <field type="CARD32" name="value_len" />
- <pad bytes="12" />
+ <field type="BOOL" name="delete"/>
+ <field type="WINDOW" name="window"/>
+ <field type="ATOM" name="property"/>
+ <field type="ATOM" name="type"/>
+ <field type="CARD32" name="long_offset"/>
+ <field type="CARD32" name="long_length"/>
+ <reply>
+ <field type="CARD8" name="format"/>
+ <field type="ATOM" name="type"/>
+ <field type="CARD32" name="bytes_after"/>
+ <field type="CARD32" name="value_len"/>
+ <pad bytes="12"/>
<list type="void" name="value">
<fieldref>value_len</fieldref>
</list>
</reply>
</request>
-
<request name="ListProperties" opcode="21">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
<reply>
- <pad bytes="1" />
- <field type="CARD16" name="atoms_len" />
- <pad bytes="22" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="atoms_len"/>
+ <pad bytes="22"/>
<list type="ATOM" name="atoms">
<fieldref>atoms_len</fieldref>
</list>
</reply>
</request>
-
<request name="SetSelectionOwner" opcode="22">
- <pad bytes="1" />
- <field type="WINDOW" name="owner" />
- <field type="ATOM" name="selection" />
- <field type="TIMESTAMP" name="time" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="owner"/>
+ <field type="ATOM" name="selection"/>
+ <field type="TIMESTAMP" name="time"/>
</request>
-
<request name="GetSelectionOwner" opcode="23">
- <pad bytes="1" />
- <field type="ATOM" name="selection" />
+ <pad bytes="1"/>
+ <field type="ATOM" name="selection"/>
<reply>
- <pad bytes="1" />
- <field type="WINDOW" name="owner" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="owner"/>
</reply>
</request>
-
<request name="ConvertSelection" opcode="24">
- <pad bytes="1" />
- <field type="WINDOW" name="requestor" />
- <field type="ATOM" name="selection" />
- <field type="ATOM" name="target" />
- <field type="ATOM" name="property" />
- <field type="TIMESTAMP" name="time" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="requestor"/>
+ <field type="ATOM" name="selection"/>
+ <field type="ATOM" name="target"/>
+ <field type="ATOM" name="property"/>
+ <field type="TIMESTAMP" name="time"/>
</request>
-
<request name="SendEvent" opcode="25">
- <field type="BOOL" name="propagate" />
- <field type="WINDOW" name="destination" />
- <field type="CARD32" name="event_mask" />
- <list type="char" name="event"><value>32</value></list>
+ <field type="BOOL" name="propagate"/>
+ <field type="WINDOW" name="destination"/>
+ <field type="CARD32" name="event_mask"/>
+ <list type="char" name="event">
+ <value>32</value>
+ </list>
</request>
-
<request name="GrabPointer" opcode="26">
- <field type="BOOL" name="owner_events" />
- <field type="WINDOW" name="grab_window" />
- <field type="CARD16" name="event_mask" />
- <field type="BYTE" name="pointer_mode" />
- <field type="BYTE" name="keyboard_mode" />
- <field type="WINDOW" name="confine_to" />
- <field type="CURSOR" name="cursor" />
- <field type="TIMESTAMP" name="time" />
+ <field type="BOOL" name="owner_events"/>
+ <field type="WINDOW" name="grab_window"/>
+ <field type="CARD16" name="event_mask"/>
+ <field type="BYTE" name="pointer_mode"/>
+ <field type="BYTE" name="keyboard_mode"/>
+ <field type="WINDOW" name="confine_to"/>
+ <field type="CURSOR" name="cursor"/>
+ <field type="TIMESTAMP" name="time"/>
<reply>
- <field type="BYTE" name="status" />
+ <field type="BYTE" name="status"/>
</reply>
</request>
-
<request name="UngrabPointer" opcode="27">
- <pad bytes="1" />
- <field type="TIMESTAMP" name="time" />
+ <pad bytes="1"/>
+ <field type="TIMESTAMP" name="time"/>
</request>
-
<request name="GrabButton" opcode="28">
- <field type="BOOL" name="owner_events" />
- <field type="WINDOW" name="grab_window" />
- <field type="CARD16" name="event_mask" />
- <field type="CARD8" name="pointer_mode" />
- <field type="CARD8" name="keyboard_mode" />
- <field type="WINDOW" name="confine_to" />
- <field type="CURSOR" name="cursor" />
- <field type="CARD8" name="button" />
- <pad bytes="1" />
- <field type="CARD16" name="modifiers" />
+ <field type="BOOL" name="owner_events"/>
+ <field type="WINDOW" name="grab_window"/>
+ <field type="CARD16" name="event_mask"/>
+ <field type="CARD8" name="pointer_mode"/>
+ <field type="CARD8" name="keyboard_mode"/>
+ <field type="WINDOW" name="confine_to"/>
+ <field type="CURSOR" name="cursor"/>
+ <field type="CARD8" name="button"/>
+ <pad bytes="1"/>
+ <field type="CARD16" name="modifiers"/>
</request>
-
<request name="UngrabButton" opcode="29">
- <field type="CARD8" name="button" />
- <field type="WINDOW" name="grab_window" />
- <field type="CARD16" name="modifiers" />
- <pad bytes="2" />
+ <field type="CARD8" name="button"/>
+ <field type="WINDOW" name="grab_window"/>
+ <field type="CARD16" name="modifiers"/>
+ <pad bytes="2"/>
</request>
-
<request name="ChangeActivePointerGrab" opcode="30">
- <pad bytes="1" />
- <field type="CURSOR" name="cursor" />
- <field type="TIMESTAMP" name="time" />
- <field type="CARD16" name="event_mask" />
+ <pad bytes="1"/>
+ <field type="CURSOR" name="cursor"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="CARD16" name="event_mask"/>
</request>
-
<request name="GrabKeyboard" opcode="31">
- <field type="BOOL" name="owner_events" />
- <field type="WINDOW" name="grab_window" />
- <field type="TIMESTAMP" name="time" />
- <field type="BYTE" name="pointer_mode" />
- <field type="BYTE" name="keyboard_mode" />
+ <field type="BOOL" name="owner_events"/>
+ <field type="WINDOW" name="grab_window"/>
+ <field type="TIMESTAMP" name="time"/>
+ <field type="BYTE" name="pointer_mode"/>
+ <field type="BYTE" name="keyboard_mode"/>
<reply>
- <field type="BYTE" name="status" />
+ <field type="BYTE" name="status"/>
</reply>
</request>
-
<request name="UngrabKeyboard" opcode="32">
- <pad bytes="1" />
- <field type="TIMESTAMP" name="time" />
+ <pad bytes="1"/>
+ <field type="TIMESTAMP" name="time"/>
</request>
-
<request name="GrabKey" opcode="33">
- <field type="BOOL" name="owner_events" />
- <field type="WINDOW" name="grab_window" />
- <field type="CARD16" name="modifiers" />
- <field type="KEYCODE" name="key" />
- <field type="CARD8" name="pointer_mode" />
- <field type="CARD8" name="keyboard_mode" />
+ <field type="BOOL" name="owner_events"/>
+ <field type="WINDOW" name="grab_window"/>
+ <field type="CARD16" name="modifiers"/>
+ <field type="KEYCODE" name="key"/>
+ <field type="CARD8" name="pointer_mode"/>
+ <field type="CARD8" name="keyboard_mode"/>
</request>
-
<request name="UngrabKey" opcode="34">
- <field type="CARD8" name="key" />
- <field type="WINDOW" name="grab_window" />
- <field type="CARD16" name="modifiers" />
+ <field type="CARD8" name="key"/>
+ <field type="WINDOW" name="grab_window"/>
+ <field type="CARD16" name="modifiers"/>
</request>
-
<request name="AllowEvents" opcode="35">
- <field type="CARD8" name="mode" />
- <field type="TIMESTAMP" name="time" />
+ <field type="CARD8" name="mode"/>
+ <field type="TIMESTAMP" name="time"/>
</request>
-
- <request name="GrabServer" opcode="36" />
-
- <request name="UngrabServer" opcode="37" />
-
+ <request name="GrabServer" opcode="36"/>
+ <request name="UngrabServer" opcode="37"/>
<request name="QueryPointer" opcode="38">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
<reply>
- <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="CARD16" name="mask" />
+ <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="CARD16" name="mask"/>
</reply>
</request>
-
<struct name="TIMECOORD">
- <field type="TIMESTAMP" name="time" />
- <field type="POINT" />
+ <field type="TIMESTAMP" name="time"/>
+ <field type="POINT"/>
</struct>
-
<request name="GetMotionEvents" opcode="39">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
- <field type="TIMESTAMP" name="start" />
- <field type="TIMESTAMP" name="stop" />
- <reply>
- <pad bytes="1" />
- <field type="CARD32" name="events_len" />
- <pad bytes="20" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
+ <field type="TIMESTAMP" name="start"/>
+ <field type="TIMESTAMP" name="stop"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD32" name="events_len"/>
+ <pad bytes="20"/>
<list type="TIMECOORD" name="events">
<fieldref>events_len</fieldref>
</list>
</reply>
</request>
-
<request name="TranslateCoordinates" opcode="40">
- <pad bytes="1" />
- <field type="WINDOW" name="src_window" />
- <field type="WINDOW" name="dst_window" />
- <field type="INT16" name="src_x" />
- <field type="INT16" name="src_y" />
- <reply>
- <field type="BOOL" name="same_screen" />
- <field type="WINDOW" name="child" />
- <field type="CARD16" name="dst_x" />
- <field type="CARD16" name="dst_y" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="src_window"/>
+ <field type="WINDOW" name="dst_window"/>
+ <field type="INT16" name="src_x"/>
+ <field type="INT16" name="src_y"/>
+ <reply>
+ <field type="BOOL" name="same_screen"/>
+ <field type="WINDOW" name="child"/>
+ <field type="CARD16" name="dst_x"/>
+ <field type="CARD16" name="dst_y"/>
</reply>
</request>
-
<request name="WarpPointer" opcode="41">
- <pad bytes="1" />
- <field type="WINDOW" name="src_window" />
- <field type="WINDOW" name="dst_window" />
- <field type="INT16" name="src_x" />
- <field type="INT16" name="src_y" />
- <field type="CARD16" name="src_width" />
- <field type="CARD16" name="src_height" />
- <field type="INT16" name="dst_x" />
- <field type="INT16" name="dst_y" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="src_window"/>
+ <field type="WINDOW" name="dst_window"/>
+ <field type="INT16" name="src_x"/>
+ <field type="INT16" name="src_y"/>
+ <field type="CARD16" name="src_width"/>
+ <field type="CARD16" name="src_height"/>
+ <field type="INT16" name="dst_x"/>
+ <field type="INT16" name="dst_y"/>
</request>
-
<request name="SetInputFocus" opcode="42">
- <field type="CARD8" name="revert_to" />
- <field type="WINDOW" name="focus" />
- <field type="TIMESTAMP" name="time" />
+ <field type="CARD8" name="revert_to"/>
+ <field type="WINDOW" name="focus"/>
+ <field type="TIMESTAMP" name="time"/>
</request>
-
<request name="GetInputFocus" opcode="43">
<reply>
- <field type="CARD8" name="revert_to" />
- <field type="WINDOW" name="focus" />
+ <field type="CARD8" name="revert_to"/>
+ <field type="WINDOW" name="focus"/>
</reply>
</request>
-
<request name="QueryKeymap" opcode="44">
<reply>
- <pad bytes="1" />
- <list type="CARD8" name="keys"><value>32</value></list>
+ <pad bytes="1"/>
+ <list type="CARD8" name="keys">
+ <value>32</value>
+ </list>
</reply>
</request>
-
<request name="OpenFont" opcode="45">
- <pad bytes="1" />
- <field type="FONT" name="fid" />
- <field type="CARD16" name="name_len" />
+ <pad bytes="1"/>
+ <field type="FONT" name="fid"/>
+ <field type="CARD16" name="name_len"/>
<list type="char" name="name">
<fieldref>name_len</fieldref>
</list>
</request>
-
<request name="CloseFont" opcode="46">
- <pad bytes="1" />
- <field type="FONT" name="font" />
+ <pad bytes="1"/>
+ <field type="FONT" name="font"/>
</request>
-
<struct name="FONTPROP">
- <field type="ATOM" name="name" />
- <field type="CARD32" name="value" />
+ <field type="ATOM" name="name"/>
+ <field type="CARD32" name="value"/>
</struct>
-
<struct name="CHARINFO">
- <field type="INT16" name="left_side_bearing" />
- <field type="INT16" name="right_side_bearing" />
- <field type="INT16" name="character_width" />
- <field type="INT16" name="ascent" />
- <field type="INT16" name="descent" />
- <field type="CARD16" name="attributes" />
+ <field type="INT16" name="left_side_bearing"/>
+ <field type="INT16" name="right_side_bearing"/>
+ <field type="INT16" name="character_width"/>
+ <field type="INT16" name="ascent"/>
+ <field type="INT16" name="descent"/>
+ <field type="CARD16" name="attributes"/>
</struct>
-
<request name="QueryFont" opcode="47">
- <pad bytes="1" />
- <field type="FONTABLE" name="font" />
+ <pad bytes="1"/>
+ <field type="FONTABLE" name="font"/>
<reply>
- <pad bytes="1" />
- <field type="CHARINFO" name="min_bounds" />
- <pad bytes="4" />
- <field type="CHARINFO" name="max_bounds" />
- <pad bytes="4" />
- <field type="CARD16" name="min_char_or_byte2" />
- <field type="CARD16" name="max_char_or_byte2" />
- <field type="CARD16" name="default_char" />
- <field type="CARD16" name="properties_len" />
- <field type="BYTE" name="draw_direction" />
- <field type="CARD8" name="min_byte1" />
- <field type="CARD8" name="max_byte1" />
- <field type="BOOL" name="all_chars_exist" />
- <field type="INT16" name="font_ascent" />
- <field type="INT16" name="font_descent" />
- <field type="CARD32" name="char_infos_len" />
+ <pad bytes="1"/>
+ <field type="CHARINFO" name="min_bounds"/>
+ <pad bytes="4"/>
+ <field type="CHARINFO" name="max_bounds"/>
+ <pad bytes="4"/>
+ <field type="CARD16" name="min_char_or_byte2"/>
+ <field type="CARD16" name="max_char_or_byte2"/>
+ <field type="CARD16" name="default_char"/>
+ <field type="CARD16" name="properties_len"/>
+ <field type="BYTE" name="draw_direction"/>
+ <field type="CARD8" name="min_byte1"/>
+ <field type="CARD8" name="max_byte1"/>
+ <field type="BOOL" name="all_chars_exist"/>
+ <field type="INT16" name="font_ascent"/>
+ <field type="INT16" name="font_descent"/>
+ <field type="CARD32" name="char_infos_len"/>
<list type="FONTPROP" name="properties">
<fieldref>properties_len</fieldref>
</list>
@@ -837,73 +800,72 @@ authorization from the authors.
</list>
</reply>
</request>
-
<request name="QueryTextExtents" opcode="48">
<exprfield type="BOOL" name="odd_length">
- <op op="&"><fieldref>string_len</fieldref><value>1</value></op>
+ <op op="&">
+ <fieldref>string_len</fieldref>
+ <value>1</value>
+ </op>
</exprfield>
- <field type="FONTABLE" name="font" />
- <list type="CHAR2B" name="string" />
+ <field type="FONTABLE" name="font"/>
+ <list type="CHAR2B" name="string"/>
<reply>
- <field type="BYTE" name="draw_direction" />
- <field type="INT16" name="font_ascent" />
- <field type="INT16" name="font_descent" />
- <field type="INT16" name="overall_ascent" />
- <field type="INT16" name="overall_descent" />
- <field type="INT32" name="overall_width" />
- <field type="INT32" name="overall_left" />
- <field type="INT32" name="overall_right" />
+ <field type="BYTE" name="draw_direction"/>
+ <field type="INT16" name="font_ascent"/>
+ <field type="INT16" name="font_descent"/>
+ <field type="INT16" name="overall_ascent"/>
+ <field type="INT16" name="overall_descent"/>
+ <field type="INT32" name="overall_width"/>
+ <field type="INT32" name="overall_left"/>
+ <field type="INT32" name="overall_right"/>
</reply>
</request>
-
<struct name="STR">
- <field type="CARD8" name="name_len" />
+ <field type="CARD8" name="name_len"/>
<list type="char" name="name">
<fieldref>name_len</fieldref>
</list>
</struct>
-
<request name="ListFonts" opcode="49">
- <pad bytes="1" />
- <field type="CARD16" name="max_names" />
- <field type="CARD16" name="pattern_len" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="max_names"/>
+ <field type="CARD16" name="pattern_len"/>
<list type="char" name="pattern">
<fieldref>pattern_len</fieldref>
</list>
<reply>
- <pad bytes="1" />
- <field type="CARD16" name="names_len" />
- <pad bytes="22" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="names_len"/>
+ <pad bytes="22"/>
<list type="STR" name="names">
<fieldref>names_len</fieldref>
</list>
</reply>
</request>
-
<request name="ListFontsWithInfo" opcode="50">
- <pad bytes="1" />
- <field type="CARD16" name="max_names" />
- <field type="CARD16" name="pattern_len" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="max_names"/>
+ <field type="CARD16" name="pattern_len"/>
<list type="char" name="pattern">
<fieldref>pattern_len</fieldref>
</list>
<reply>
- <field type="CARD8" name="name_len" />
- <field type="CHARINFO" name="min_bounds" />
- <pad bytes="4" />
- <field type="CHARINFO" name="max_bounds" />
- <pad bytes="4" />
- <field type="CARD16" name="min_char_or_byte2" />
- <field type="CARD16" name="max_char_or_byte2" />
- <field type="CARD16" name="default_char" />
- <field type="CARD16" name="properties_len" />
- <field type="BYTE" name="draw_direction" />
- <field type="CARD8" name="min_byte1" />
- <field type="CARD8" name="max_byte1" />
- <field type="BOOL" name="all_chars_exist" />
- <field type="INT16" name="font_ascent" />
- <field type="INT16" name="font_descent" />
- <field type="CARD32" name="replies_hint" />
+ <field type="CARD8" name="name_len"/>
+ <field type="CHARINFO" name="min_bounds"/>
+ <pad bytes="4"/>
+ <field type="CHARINFO" name="max_bounds"/>
+ <pad bytes="4"/>
+ <field type="CARD16" name="min_char_or_byte2"/>
+ <field type="CARD16" name="max_char_or_byte2"/>
+ <field type="CARD16" name="default_char"/>
+ <field type="CARD16" name="properties_len"/>
+ <field type="BYTE" name="draw_direction"/>
+ <field type="CARD8" name="min_byte1"/>
+ <field type="CARD8" name="max_byte1"/>
+ <field type="BOOL" name="all_chars_exist"/>
+ <field type="INT16" name="font_ascent"/>
+ <field type="INT16" name="font_descent"/>
+ <field type="CARD32" name="replies_hint"/>
<list type="FONTPROP" name="properties">
<fieldref>properties_len</fieldref>
</list>
@@ -912,205 +874,177 @@ authorization from the authors.
</list>
</reply>
</request>
-
<request name="SetFontPath" opcode="51">
- <pad bytes="1" />
- <field type="CARD16" name="font_qty" />
- <list type="char" name="path" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="font_qty"/>
+ <list type="char" name="path"/>
</request>
-
<request name="GetFontPath" opcode="52">
<reply>
- <pad bytes="1" />
- <field type="CARD16" name="path_len" />
- <pad bytes="22" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="path_len"/>
+ <pad bytes="22"/>
<list type="STR" name="path">
<fieldref>path_len</fieldref>
</list>
</reply>
</request>
-
<request name="CreatePixmap" opcode="53">
- <field type="CARD8" name="depth" />
- <field type="PIXMAP" name="pid" />
- <field type="DRAWABLE" name="drawable" />
- <field type="SIZE" name="size" />
+ <field type="CARD8" name="depth"/>
+ <field type="PIXMAP" name="pid"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="SIZE" name="size"/>
</request>
-
<request name="FreePixmap" opcode="54">
- <pad bytes="1" />
- <field type="PIXMAP" name="pixmap" />
+ <pad bytes="1"/>
+ <field type="PIXMAP" name="pixmap"/>
</request>
-
<request name="CreateGC" opcode="55">
- <pad bytes="1" />
- <field type="GCONTEXT" name="cid" />
- <field type="DRAWABLE" name="drawable" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <pad bytes="1"/>
+ <field type="GCONTEXT" name="cid"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
-
<request name="ChangeGC" opcode="56">
- <pad bytes="1" />
- <field type="GCONTEXT" name="gc" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <pad bytes="1"/>
+ <field type="GCONTEXT" name="gc"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
-
<request name="CopyGC" opcode="57">
- <pad bytes="1" />
- <field type="GCONTEXT" name="src_gc" />
- <field type="GCONTEXT" name="dst_gc" />
- <field type="CARD32" name="value_mask" />
+ <pad bytes="1"/>
+ <field type="GCONTEXT" name="src_gc"/>
+ <field type="GCONTEXT" name="dst_gc"/>
+ <field type="CARD32" name="value_mask"/>
</request>
-
<request name="SetDashes" opcode="58">
- <pad bytes="1" />
- <field type="GCONTEXT" name="gc" />
- <field type="CARD16" name="dash_offset" />
- <field type="CARD16" name="dashes_len" />
+ <pad bytes="1"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="CARD16" name="dash_offset"/>
+ <field type="CARD16" name="dashes_len"/>
<list type="CARD8" name="dashes">
<fieldref>dashes_len</fieldref>
</list>
</request>
-
<request name="SetClipRectangles" opcode="59">
- <field type="BYTE" name="ordering" />
- <field type="GCONTEXT" name="gc" />
- <field type="POINT" name="clip_origin" />
- <list type="RECTANGLE" name="rectangles" />
+ <field type="BYTE" name="ordering"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="POINT" name="clip_origin"/>
+ <list type="RECTANGLE" name="rectangles"/>
</request>
-
<request name="FreeGC" opcode="60">
- <pad bytes="1" />
- <field type="GCONTEXT" name="gc" />
+ <pad bytes="1"/>
+ <field type="GCONTEXT" name="gc"/>
</request>
-
<request name="ClearArea" opcode="61">
- <field type="BOOL" name="exposures" />
- <field type="WINDOW" name="window" />
- <field type="RECTANGLE" />
+ <field type="BOOL" name="exposures"/>
+ <field type="WINDOW" name="window"/>
+ <field type="RECTANGLE"/>
</request>
-
<request name="CopyArea" opcode="62">
- <pad bytes="1" />
- <field type="DRAWABLE" name="src_drawable" />
- <field type="DRAWABLE" name="dst_drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="INT16" name="src_x" />
- <field type="INT16" name="src_y" />
- <field type="INT16" name="dst_x" />
- <field type="INT16" name="dst_y" />
- <field type="SIZE" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="src_drawable"/>
+ <field type="DRAWABLE" name="dst_drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="INT16" name="src_x"/>
+ <field type="INT16" name="src_y"/>
+ <field type="INT16" name="dst_x"/>
+ <field type="INT16" name="dst_y"/>
+ <field type="SIZE"/>
</request>
-
<request name="CopyPlane" opcode="63">
- <pad bytes="1" />
- <field type="DRAWABLE" name="src_drawable" />
- <field type="DRAWABLE" name="dst_drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="INT16" name="src_x" />
- <field type="INT16" name="src_y" />
- <field type="INT16" name="dst_x" />
- <field type="INT16" name="dst_y" />
- <field type="SIZE" />
- <field type="CARD32" name="bit_plane" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="src_drawable"/>
+ <field type="DRAWABLE" name="dst_drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="INT16" name="src_x"/>
+ <field type="INT16" name="src_y"/>
+ <field type="INT16" name="dst_x"/>
+ <field type="INT16" name="dst_y"/>
+ <field type="SIZE"/>
+ <field type="CARD32" name="bit_plane"/>
</request>
-
<request name="PolyPoint" opcode="64" combine-adjacent="true">
- <field type="BYTE" name="coordinate_mode" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <list type="POINT" name="points" />
+ <field type="BYTE" name="coordinate_mode"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <list type="POINT" name="points"/>
</request>
-
<request name="PolyLine" opcode="65" combine-adjacent="true">
- <field type="BYTE" name="coordinate_mode" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <list type="POINT" name="points" />
+ <field type="BYTE" name="coordinate_mode"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <list type="POINT" name="points"/>
</request>
-
<struct name="SEGMENT">
- <field type="INT16" name="x1" />
- <field type="INT16" name="y1" />
- <field type="INT16" name="x2" />
- <field type="INT16" name="y2" />
+ <field type="INT16" name="x1"/>
+ <field type="INT16" name="y1"/>
+ <field type="INT16" name="x2"/>
+ <field type="INT16" name="y2"/>
</struct>
-
<request name="PolySegment" opcode="66" combine-adjacent="true">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <list type="SEGMENT" name="segments" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <list type="SEGMENT" name="segments"/>
</request>
-
<request name="PolyRectangle" opcode="67" combine-adjacent="true">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <list type="RECTANGLE" name="rectangles" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <list type="RECTANGLE" name="rectangles"/>
</request>
-
- <!--
+<!--
The semantics of PolyArc change after the first arc: the GC's
join style may be applied to successive arcs under some circumstances.
So using combine-adjacent here is bad.
-->
<request name="PolyArc" opcode="68">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <list type="ARC" name="arcs" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <list type="ARC" name="arcs"/>
</request>
-
<request name="FillPoly" opcode="69">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="CARD8" name="shape" />
- <field type="CARD8" name="coordinate_mode" />
- <list type="POINT" name="points" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="CARD8" name="shape"/>
+ <field type="CARD8" name="coordinate_mode"/>
+ <list type="POINT" name="points"/>
</request>
-
<request name="PolyFillRectangle" opcode="70" combine-adjacent="true">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <list type="RECTANGLE" name="rectangles" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <list type="RECTANGLE" name="rectangles"/>
</request>
-
<request name="PolyFillArc" opcode="71" combine-adjacent="true">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <list type="ARC" name="arcs" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <list type="ARC" name="arcs"/>
</request>
-
<request name="PutImage" opcode="72">
- <field type="CARD8" name="format" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="SIZE" />
- <field type="INT16" name="dst_x" />
- <field type="INT16" name="dst_y" />
- <field type="CARD8" name="left_pad" />
- <field type="CARD8" name="depth" />
- <list type="BYTE" name="data" />
+ <field type="CARD8" name="format"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="SIZE"/>
+ <field type="INT16" name="dst_x"/>
+ <field type="INT16" name="dst_y"/>
+ <field type="CARD8" name="left_pad"/>
+ <field type="CARD8" name="depth"/>
+ <list type="BYTE" name="data"/>
</request>
-
- <!-- FIXME: data array in reply will include padding, but ought not to. -->
+<!-- FIXME: data array in reply will include padding, but ought not to. -->
<request name="GetImage" opcode="73">
- <field type="CARD8" name="format" />
- <field type="DRAWABLE" name="drawable" />
- <field type="RECTANGLE" />
- <field type="CARD32" name="plane_mask" />
- <reply>
- <field type="CARD8" name="depth" />
- <field type="VISUALID" name="visual" />
- <pad bytes="20" />
+ <field type="CARD8" name="format"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="RECTANGLE"/>
+ <field type="CARD32" name="plane_mask"/>
+ <reply>
+ <field type="CARD8" name="depth"/>
+ <field type="VISUALID" name="visual"/>
+ <pad bytes="20"/>
<list type="BYTE" name="data">
<op op="*">
<fieldref>length</fieldref>
@@ -1119,121 +1053,108 @@ authorization from the authors.
</list>
</reply>
</request>
-
<request name="PolyText8" opcode="74">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="POINT" />
- <list type="BYTE" name="items" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="POINT"/>
+ <list type="BYTE" name="items"/>
</request>
-
<request name="PolyText16" opcode="75">
- <pad bytes="1" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="POINT" />
- <list type="BYTE" name="items" />
+ <pad bytes="1"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="POINT"/>
+ <list type="BYTE" name="items"/>
</request>
-
<request name="ImageText8" opcode="76">
- <field type="BYTE" name="string_len" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="POINT" />
+ <field type="BYTE" name="string_len"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="POINT"/>
<list type="char" name="string">
<fieldref>string_len</fieldref>
</list>
</request>
-
<request name="ImageText16" opcode="77">
- <field type="BYTE" name="string_len" />
- <field type="DRAWABLE" name="drawable" />
- <field type="GCONTEXT" name="gc" />
- <field type="POINT" />
+ <field type="BYTE" name="string_len"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="GCONTEXT" name="gc"/>
+ <field type="POINT"/>
<list type="CHAR2B" name="string">
<fieldref>string_len</fieldref>
</list>
</request>
-
<request name="CreateColormap" opcode="78">
- <field type="BYTE" name="alloc" />
- <field type="COLORMAP" name="mid" />
- <field type="WINDOW" name="window" />
- <field type="VISUALID" name="visual" />
+ <field type="BYTE" name="alloc"/>
+ <field type="COLORMAP" name="mid"/>
+ <field type="WINDOW" name="window"/>
+ <field type="VISUALID" name="visual"/>
</request>
-
<request name="FreeColormap" opcode="79">
- <pad bytes="1" />
- <field type="COLORMAP" name="cmap" />
+ <pad bytes="1"/>
+ <field type="COLORMAP" name="cmap"/>
</request>
-
<request name="CopyColormapAndFree" opcode="80">
- <pad bytes="1" />
- <field type="COLORMAP" name="mid" />
- <field type="COLORMAP" name="src_cmap" />
+ <pad bytes="1"/>
+ <field type="COLORMAP" name="mid"/>
+ <field type="COLORMAP" name="src_cmap"/>
</request>
-
<request name="InstallColormap" opcode="81">
- <pad bytes="1" />
- <field type="COLORMAP" name="cmap" />
+ <pad bytes="1"/>
+ <field type="COLORMAP" name="cmap"/>
</request>
-
<request name="UninstallColormap" opcode="82">
- <pad bytes="1" />
- <field type="COLORMAP" name="cmap" />
+ <pad bytes="1"/>
+ <field type="COLORMAP" name="cmap"/>
</request>
-
<request name="ListInstalledColormaps" opcode="83">
- <pad bytes="1" />
- <field type="WINDOW" name="window" />
+ <pad bytes="1"/>
+ <field type="WINDOW" name="window"/>
<reply>
- <pad bytes="1" />
- <field type="CARD16" name="cmaps_len" />
- <pad bytes="22" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="cmaps_len"/>
+ <pad bytes="22"/>
<list type="COLORMAP" name="cmaps">
<fieldref>cmaps_len</fieldref>
</list>
</reply>
</request>
-
<request name="AllocColor" opcode="84">
- <pad bytes="1" />
- <field type="COLORMAP" name="cmap" />
- <field type="COLOR" name="color" />
- <reply>
- <pad bytes="1" />
- <field type="COLOR" name="color" />
- <pad bytes="2" />
- <field type="CARD32" name="pixel" />
+ <pad bytes="1"/>
+ <field type="COLORMAP" name="cmap"/>
+ <field type="COLOR" name="color"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="COLOR" name="color"/>
+ <pad bytes="2"/>
+ <field type="CARD32" name="pixel"/>
</reply>
</request>
-
<request name="AllocNamedColor" opcode="85">
- <pad bytes="1" />
- <field type="COLORMAP" name="cmap" />
- <field type="CARD16" name="name_len" />
+ <pad bytes="1"/>
+ <field type="COLORMAP" name="cmap"/>
+ <field type="CARD16" name="name_len"/>
<list type="char" name="name">
<fieldref>name_len</fieldref>
</list>
<reply>
- <pad bytes="1" />
- <field type="CARD32" name="pixel" />
- <field type="COLOR" name="exact_color" />
- <field type="COLOR" name="visual_color" />
+ <pad bytes="1"/>
+ <field type="CARD32" name="pixel"/>
+ <field type="COLOR" name="exact_color"/>
+ <field type="COLOR" name="visual_color"/>
</reply>
</request>
-
<request name="AllocColorCells" opcode="86">
- <field type="BOOL" name="contiguous" />
- <field type="COLORMAP" name="cmap" />
- <field type="CARD16" name="colors" />
- <field type="CARD16" name="planes" />
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="pixels_len" />
- <field type="CARD16" name="masks_len" />
- <pad bytes="20" />
+ <field type="BOOL" name="contiguous"/>
+ <field type="COLORMAP" name="cmap"/>
+ <field type="CARD16" name="colors"/>
+ <field type="CARD16" name="planes"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="pixels_len"/>
+ <field type="CARD16" name="masks_len"/>
+ <pad bytes="20"/>
<list type="CARD32" name="pixels">
<fieldref>pixels_len</fieldref>
</list>
@@ -1242,163 +1163,147 @@ authorization from the authors.
</list>
</reply>
</request>
-
<request name="AllocColorPlanes" opcode="87">
- <field type="BOOL" name="contiguous" />
- <field type="COLORMAP" name="cmap" />
- <field type="CARD16" name="colors" />
- <field type="CARD16" name="reds" />
- <field type="CARD16" name="greens" />
- <field type="CARD16" name="blues" />
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="pixels_len" />
- <pad bytes="2" />
- <field type="CARD32" name="red_mask" />
- <field type="CARD32" name="green_mask" />
- <field type="CARD32" name="blue_mask" />
- <pad bytes="8" />
+ <field type="BOOL" name="contiguous"/>
+ <field type="COLORMAP" name="cmap"/>
+ <field type="CARD16" name="colors"/>
+ <field type="CARD16" name="reds"/>
+ <field type="CARD16" name="greens"/>
+ <field type="CARD16" name="blues"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="pixels_len"/>
+ <pad bytes="2"/>
+ <field type="CARD32" name="red_mask"/>
+ <field type="CARD32" name="green_mask"/>
+ <field type="CARD32" name="blue_mask"/>
+ <pad bytes="8"/>
<list type="CARD32" name="pixels">
<fieldref>pixels_len</fieldref>
</list>
</reply>
</request>
-
<request name="FreeColors" opcode="88">
- <pad bytes="1" />
- <field type="COLORMAP" name="cmap" />
- <field type="CARD32" name="plane_mask" />
- <list type="CARD32" name="pixels" />
+ <pad bytes="1"/>
+ <field type="COLORMAP" name="cmap"/>
+ <field type="CARD32" name="plane_mask"/>
+ <list type="CARD32" name="pixels"/>
</request>
-
<struct name="COLORITEM">
- <field type="CARD32" name="pixel" />
- <field type="COLOR" name="color" />
- <field type="BYTE" name="flags" />
- <pad bytes="1" />
+ <field type="CARD32" name="pixel"/>
+ <field type="COLOR" name="color"/>
+ <field type="BYTE" name="flags"/>
+ <pad bytes="1"/>
</struct>
-
<request name="StoreColors" opcode="89" combine-adjacent="true">
- <pad bytes="1" />
- <field type="COLORMAP" name="cmap" />
- <list type="COLORITEM" name="items" />
+ <pad bytes="1"/>
+ <field type="COLORMAP" name="cmap"/>
+ <list type="COLORITEM" name="items"/>
</request>
-
<request name="StoreNamedColor" opcode="90">
- <field type="CARD8" name="flags" />
- <field type="COLORMAP" name="cmap" />
- <field type="CARD32" name="pixel" />
- <field type="CARD16" name="name_len" />
+ <field type="CARD8" name="flags"/>
+ <field type="COLORMAP" name="cmap"/>
+ <field type="CARD32" name="pixel"/>
+ <field type="CARD16" name="name_len"/>
<list type="char" name="name">
<fieldref>name_len</fieldref>
</list>
</request>
-
<struct name="RGB">
- <field type="COLOR" />
- <pad bytes="2" />
+ <field type="COLOR"/>
+ <pad bytes="2"/>
</struct>
-
<request name="QueryColors" opcode="91">
- <pad bytes="1" />
- <field type="COLORMAP" name="cmap" />
- <list type="CARD32" name="pixels" />
- <reply>
- <pad bytes="1" />
- <field type="CARD16" name="colors_len" />
- <pad bytes="22" />
+ <pad bytes="1"/>
+ <field type="COLORMAP" name="cmap"/>
+ <list type="CARD32" name="pixels"/>
+ <reply>
+ <pad bytes="1"/>
+ <field type="CARD16" name="colors_len"/>
+ <pad bytes="22"/>
<list type="RGB" name="colors">
<fieldref>colors_len</fieldref>
</list>
</reply>
</request>
-
<request name="LookupColor" opcode="92">
- <pad bytes="1" />
- <field type="COLORMAP" name="cmap" />
- <field type="CARD16" name="name_len" />
+ <pad bytes="1"/>
+ <field type="COLORMAP" name="cmap"/>
+ <field type="CARD16" name="name_len"/>
<list type="char" name="name">
<fieldref>name_len</fieldref>
</list>
<reply>
- <pad bytes="1" />
- <field type="COLOR" name="exact_color" />
- <field type="COLOR" name="visual_color" />
+ <pad bytes="1"/>
+ <field type="COLOR" name="exact_color"/>
+ <field type="COLOR" name="visual_color"/>
</reply>
</request>
-
<request name="CreateCursor" opcode="93">
- <pad bytes="1" />
- <field type="CURSOR" name="cid" />
- <field type="PIXMAP" name="source" />
- <field type="PIXMAP" name="mask" />
- <field type="COLOR" name="fore_color" />
- <field type="COLOR" name="back_color" />
- <field type="POINT" />
+ <pad bytes="1"/>
+ <field type="CURSOR" name="cid"/>
+ <field type="PIXMAP" name="source"/>
+ <field type="PIXMAP" name="mask"/>
+ <field type="COLOR" name="fore_color"/>
+ <field type="COLOR" name="back_color"/>
+ <field type="POINT"/>
</request>
-
<request name="CreateGlyphCursor" opcode="94">
- <pad bytes="1" />
- <field type="CURSOR" name="cid" />
- <field type="FONT" name="source_font" />
- <field type="FONT" name="mask_font" />
- <field type="CARD16" name="source_char" />
- <field type="CARD16" name="mask_char" />
- <field type="COLOR" name="fore_color" />
- <field type="COLOR" name="back_color" />
+ <pad bytes="1"/>
+ <field type="CURSOR" name="cid"/>
+ <field type="FONT" name="source_font"/>
+ <field type="FONT" name="mask_font"/>
+ <field type="CARD16" name="source_char"/>
+ <field type="CARD16" name="mask_char"/>
+ <field type="COLOR" name="fore_color"/>
+ <field type="COLOR" name="back_color"/>
</request>
-
<request name="FreeCursor" opcode="95">
- <pad bytes="1" />
- <field type="CURSOR" name="cursor" />
+ <pad bytes="1"/>
+ <field type="CURSOR" name="cursor"/>
</request>
-
<request name="RecolorCursor" opcode="96">
- <pad bytes="1" />
- <field type="CURSOR" name="cursor" />
- <field type="COLOR" name="fore_color" />
- <field type="COLOR" name="back_color" />
+ <pad bytes="1"/>
+ <field type="CURSOR" name="cursor"/>
+ <field type="COLOR" name="fore_color"/>
+ <field type="COLOR" name="back_color"/>
</request>
-
<request name="QueryBestSize" opcode="97">
- <field type="CARD8" name="class" />
- <field type="DRAWABLE" name="drawable" />
- <field type="SIZE" name="size" />
+ <field type="CARD8" name="class"/>
+ <field type="DRAWABLE" name="drawable"/>
+ <field type="SIZE" name="size"/>
<reply>
- <pad bytes="1" />
- <field type="SIZE" name="value" />
+ <pad bytes="1"/>
+ <field type="SIZE" name="value"/>
</reply>
</request>
-
<request name="QueryExtension" opcode="98">
- <pad bytes="1" />
- <field type="CARD16" name="name_len" />
+ <pad bytes="1"/>
+ <field type="CARD16" name="name_len"/>
<list type="char" name="name">
<fieldref>name_len</fieldref>
</list>
<reply>
- <pad bytes="1" />
- <field type="BOOL" name="present" />
- <field type="CARD8" name="major_opcode" />
- <field type="CARD8" name="first_event" />
- <field type="CARD8" name="first_error" />
+ <pad bytes="1"/>
+ <field type="BOOL" name="present"/>
+ <field type="CARD8" name="major_opcode"/>
+ <field type="CARD8" name="first_event"/>
+ <field type="CARD8" name="first_error"/>
</reply>
</request>
-
<request name="ListExtensions" opcode="99">
<reply>
- <field type="CARD8" name="names_len" />
- <pad bytes="24" />
+ <field type="CARD8" name="names_len"/>
+ <pad bytes="24"/>
<list type="STR" name="names">
<fieldref>names_len</fieldref>
</list>
</reply>
</request>
-
<request name="ChangeKeyboardMapping" opcode="100">
- <field type="CARD8" name="keycode_count" />
- <field type="KEYCODE" name="first_keycode" />
- <field type="CARD8" name="keysyms_per_keycode" />
+ <field type="CARD8" name="keycode_count"/>
+ <field type="KEYCODE" name="first_keycode"/>
+ <field type="CARD8" name="keysyms_per_keycode"/>
<list type="KEYSYM" name="keysyms">
<op op="*">
<fieldref>keycode_count</fieldref>
@@ -1406,14 +1311,13 @@ authorization from the authors.
</op>
</list>
</request>
-
<request name="GetKeyboardMapping" opcode="101">
- <pad bytes="1" />
- <field type="KEYCODE" name="first_keycode" />
- <field type="CARD8" name="count" />
+ <pad bytes="1"/>
+ <field type="KEYCODE" name="first_keycode"/>
+ <field type="CARD8" name="count"/>
<reply>
- <field type="BYTE" name="keysyms_per_keycode" />
- <pad bytes="24" />
+ <field type="BYTE" name="keysyms_per_keycode"/>
+ <pad bytes="24"/>
<list type="KEYSYM" name="keysyms">
<op op="*">
<fieldref>length</fieldref>
@@ -1422,143 +1326,123 @@ authorization from the authors.
</list>
</reply>
</request>
-
<request name="ChangeKeyboardControl" opcode="102">
- <pad bytes="1" />
- <valueparam value-mask-type="CARD32"
- value-mask-name="value_mask"
- value-list-name="value_list" />
+ <pad bytes="1"/>
+ <valueparam value-mask-type="CARD32" value-mask-name="value_mask" value-list-name="value_list"/>
</request>
-
<request name="GetKeyboardControl" opcode="103">
<reply>
- <field type="BYTE" name="global_auto_repeat" />
- <field type="CARD32" name="led_mask" />
- <field type="CARD8" name="key_click_percent" />
- <field type="CARD8" name="bell_percent" />
- <field type="CARD16" name="bell_pitch" />
- <field type="CARD16" name="bell_duration" />
- <pad bytes="2" />
- <list type="CARD8" name="auto_repeats"><value>32</value></list>
+ <field type="BYTE" name="global_auto_repeat"/>
+ <field type="CARD32" name="led_mask"/>
+ <field type="CARD8" name="key_click_percent"/>
+ <field type="CARD8" name="bell_percent"/>
+ <field type="CARD16" name="bell_pitch"/>
+ <field type="CARD16" name="bell_duration"/>
+ <pad bytes="2"/>
+ <list type="CARD8" name="auto_repeats">
+ <value>32</value>
+ </list>
</reply>
</request>
-
<request name="Bell" opcode="104">
- <field type="INT8" name="percent" />
+ <field type="INT8" name="percent"/>
</request>
-
- <struct name="PointerControl">
- <field type="CARD16" name="acceleration_numerator" />
- <field type="CARD16" name="acceleration_denominator" />
- <field type="CARD16" name="threshold" />
- </struct>
-
+ <struct name="PointerControl">
+ <field type="CARD16" name="acceleration_numerator"/>
+ <field type="CARD16" name="acceleration_denominator"/>
+ <field type="CARD16" name="threshold"/>
+ </struct>
<request name="ChangePointerControl" opcode="105">
- <pad bytes="1" />
- <field type="PointerControl" name="value" />
- <field type="BOOL" name="do_acceleration" />
- <field type="BOOL" name="do_threshold" />
+ <pad bytes="1"/>
+ <field type="PointerControl" name="value"/>
+ <field type="BOOL" name="do_acceleration"/>
+ <field type="BOOL" name="do_threshold"/>
</request>
-
<request name="GetPointerControl" opcode="106">
<reply>
- <pad bytes="1" />
- <field type="PointerControl" name="value" />
+ <pad bytes="1"/>
+ <field type="PointerControl" name="value"/>
</reply>
</request>
-
- <struct name="ScreenSaver">
- <field type="INT16" name="timeout" />
- <field type="INT16" name="interval" />
- <field type="CARD8" name="prefer_blanking" />
- <field type="CARD8" name="allow_exposures" />
- </struct>
-
+ <struct name="ScreenSaver">
+ <field type="INT16" name="timeout"/>
+ <field type="INT16" name="interval"/>
+ <field type="CARD8" name="prefer_blanking"/>
+ <field type="CARD8" name="allow_exposures"/>
+ </struct>
<request name="SetScreenSaver" opcode="107">
- <pad bytes="1" />
- <field type="ScreenSaver" name="value" />
+ <pad bytes="1"/>
+ <field type="ScreenSaver" name="value"/>
</request>
-
<request name="GetScreenSaver" opcode="108">
<reply>
- <pad bytes="1" />
- <field type="ScreenSaver" name="value" />
+ <pad bytes="1"/>
+ <field type="ScreenSaver" name="value"/>
</reply>
</request>
-
<struct name="HOST">
- <field type="CARD8" name="family" />
- <pad bytes="1" />
- <field type="CARD16" name="address_len" />
+ <field type="CARD8" name="family"/>
+ <pad bytes="1"/>
+ <field type="CARD16" name="address_len"/>
<list type="BYTE" name="address">
<fieldref>address_len</fieldref>
</list>
- </struct>
-
- <request name="ChangeHosts" opcode="109">
- <field type="CARD8" name="mode" />
- <field type="HOST" name="host" />
+ </struct>
+ <request name="ChangeHosts" opcode="109">
+ <field type="CARD8" name="mode"/>
+ <field type="HOST" name="host"/>
</request>
-
<request name="ListHosts" opcode="110">
<reply>
- <field type="BYTE" name="mode" />
- <field type="CARD16" name="hosts_len" />
- <pad bytes="22" />
+ <field type="BYTE" name="mode"/>
+ <field type="CARD16" name="hosts_len"/>
+ <pad bytes="22"/>
<list type="HOST" name="hosts">
<fieldref>hosts_len</fieldref>
</list>
</reply>
</request>
-
<request name="SetAccessControl" opcode="111">
- <field type="CARD8" name="mode" />
+ <field type="CARD8" name="mode"/>
</request>
-
<request name="SetCloseDownMode" opcode="112">
- <field type="CARD8" name="mode" />
+ <field type="CARD8" name="mode"/>
</request>
-
<request name="KillClient" opcode="113">
- <pad bytes="1" />
- <field type="CARD32" name="resource" />
+ <pad bytes="1"/>
+ <field type="CARD32" name="resource"/>
</request>
-
<request name="RotateProperties" opcode="114">
- <field type="WINDOW" name="window" />
- <field type="CARD16" name="atoms_len" />
- <field type="INT16" name="delta" />
+ <field type="WINDOW" name="window"/>
+ <field type="CARD16" name="atoms_len"/>
+ <field type="INT16" name="delta"/>
<list type="ATOM" name="atoms">
<fieldref>atoms_len</fieldref>
</list>
</request>
-
<request name="ForceScreenSaver" opcode="115">
- <field type="CARD8" name="mode" />
+ <field type="CARD8" name="mode"/>
</request>
-
<request name="SetPointerMapping" opcode="116">
- <field type="CARD8" name="map_len" />
+ <field type="CARD8" name="map_len"/>
<list type="CARD8" name="map">
<fieldref>map_len</fieldref>
</list>
<reply>
- <field type="BYTE" name="status" />
+ <field type="BYTE" name="status"/>
</reply>
</request>
-
<request name="GetPointerMapping" opcode="117">
<reply>
- <field type="CARD8" name="map_len" />
- <pad bytes="24" />
+ <field type="CARD8" name="map_len"/>
+ <pad bytes="24"/>
<list type="CARD8" name="map">
<fieldref>map_len</fieldref>
</list>
</reply>
</request>
-
<request name="SetModifierMapping" opcode="118">
- <field type="CARD8" name="keycodes_per_modifier" />
+ <field type="CARD8" name="keycodes_per_modifier"/>
<list type="KEYCODE" name="keycodes">
<op op="*">
<fieldref>keycodes_per_modifier</fieldref>
@@ -1566,14 +1450,13 @@ authorization from the authors.
</op>
</list>
<reply>
- <field type="BYTE" name="status" />
+ <field type="BYTE" name="status"/>
</reply>
</request>
-
<request name="GetModifierMapping" opcode="119">
<reply>
- <field type="CARD8" name="keycodes_per_modifier" />
- <pad bytes="24" />
+ <field type="CARD8" name="keycodes_per_modifier"/>
+ <pad bytes="24"/>
<list type="KEYCODE" name="keycodes">
<op op="*">
<fieldref>keycodes_per_modifier</fieldref>
@@ -1582,12 +1465,10 @@ authorization from the authors.
</list>
</reply>
</request>
-
- <!--
+<!--
FIXME: NoOperation should allow specifying payload length
but geez, malloc()ing a 262140 byte buffer just so I have something
to hand to write(2) seems silly...!
-->
- <request name="NoOperation" opcode="127" />
-
+ <request name="NoOperation" opcode="127"/>
</xcb>
More information about the xcb-commit
mailing list