[Xcb-commit] Branch 'xspec' - 3 commits - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Thu Mar 23 19:33:49 PST 2006
xcb-proto/src/extensions/composite.xml | 4 ++--
xcb-proto/src/extensions/dpms.xml | 11 +++++++++--
xcb-proto/src/extensions/shm.xml | 2 +-
xcb-proto/src/extensions/xv.xml | 2 +-
xcb-proto/src/xcb_types.xml | 12 ++++++++----
xcb-proto/src/xproto.xml | 3 ---
6 files changed, 21 insertions(+), 13 deletions(-)
New commits:
diff-tree dfdbb311904578823119f1c51e5f2a2109976b0f (from 270acfc0b43e26e8465f1014508f238c042b34d4)
Author: Alp Toker <alp at atoker.com>
Date: Fri Mar 24 03:25:11 2006 +0000
Remove some obsolete comments
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index ecd4d79..3e387cf 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -496,9 +496,6 @@ authorization from the authors.
<item name="pointer-root"/>
<item name="none"/>
</enum>
-<!-- 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="back-pixmap">
diff-tree 270acfc0b43e26e8465f1014508f238c042b34d4 (from 43860414003580e23de7d43221adc220816679fa)
Author: Alp Toker <alp at atoker.com>
Date: Fri Mar 24 02:53:48 2006 +0000
New DPMS enum, not yet annotated
diff --git a/xcb-proto/src/extensions/dpms.xml b/xcb-proto/src/extensions/dpms.xml
index 6b7898f..a2aa44c 100644
--- a/xcb-proto/src/extensions/dpms.xml
+++ b/xcb-proto/src/extensions/dpms.xml
@@ -27,6 +27,13 @@ sale, use or other dealings in this Soft
authorization from the authors.
-->
<extension header="dpms" xname="DPMS" name="DPMS">
+<!-- TODO: make use of this enum -->
+ <enum name="DPMSMode">
+ <item name="on"/>
+ <item name="standby"/>
+ <item name="suspend"/>
+ <item name="off"/>
+ </enum>
<request name="GetVersion" number="0">
<field type="Version32" name="client-version"/>
<reply>
diff-tree 43860414003580e23de7d43221adc220816679fa (from 140943d8182dcb259b9f9d26b09b97066f715f43)
Author: Alp Toker <alp at atoker.com>
Date: Fri Mar 24 02:50:58 2006 +0000
Provide and use Version16 and Version32 as there is no standard for
major/minor version numbers. These replace previously incorrect Version
struct use.
Thanks to Josh for spotting this one
diff --git a/xcb-proto/src/extensions/composite.xml b/xcb-proto/src/extensions/composite.xml
index 90d6449..da4b682 100644
--- a/xcb-proto/src/extensions/composite.xml
+++ b/xcb-proto/src/extensions/composite.xml
@@ -32,10 +32,10 @@ authorization from the authors.
<item name="manual"/>
</enum>
<request name="QueryVersion" number="0">
- <field type="Version" name="client-version"/>
+ <field type="Version32" name="client-version"/>
<reply>
<pad bytes="1"/>
- <field type="Version" name="server-version"/>
+ <field type="Version32" name="server-version"/>
<pad bytes="16"/>
</reply>
</request>
diff --git a/xcb-proto/src/extensions/dpms.xml b/xcb-proto/src/extensions/dpms.xml
index cb45632..6b7898f 100644
--- a/xcb-proto/src/extensions/dpms.xml
+++ b/xcb-proto/src/extensions/dpms.xml
@@ -28,10 +28,10 @@ authorization from the authors.
-->
<extension header="dpms" xname="DPMS" name="DPMS">
<request name="GetVersion" number="0">
- <field type="Version" name="client-version"/>
+ <field type="Version32" name="client-version"/>
<reply>
<pad bytes="1"/>
- <field type="Version" name="server-version"/>
+ <field type="Version32" name="server-version"/>
</reply>
</request>
<request name="Capable" number="1">
diff --git a/xcb-proto/src/extensions/shm.xml b/xcb-proto/src/extensions/shm.xml
index ecfa6e4..c9d5db0 100644
--- a/xcb-proto/src/extensions/shm.xml
+++ b/xcb-proto/src/extensions/shm.xml
@@ -41,7 +41,7 @@ authorization from the authors.
<request name="QueryVersion" number="0">
<reply>
<field type="bool" name="shared-pixmaps"/>
- <field type="Version"/>
+ <field type="Version32"/>
<field type="CARD16" name="uid"/>
<field type="CARD16" name="gid"/>
<field type="CARD8" name="pixmap-format"/>
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index 3270adc..2a11964 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -180,7 +180,7 @@ authorization from the authors.
<request name="QueryExtension" number="0">
<reply>
<pad bytes="1"/>
- <field type="Version"/>
+ <field type="Version16" name="version"/>
</reply>
</request>
<request name="QueryAdaptors" number="1">
diff --git a/xcb-proto/src/xcb_types.xml b/xcb-proto/src/xcb_types.xml
index 8192f25..1a1adbc 100644
--- a/xcb-proto/src/xcb_types.xml
+++ b/xcb-proto/src/xcb_types.xml
@@ -56,10 +56,14 @@ authorization from the authors.
<field type="CARD8" name="byte1"/>
<field type="CARD8" name="byte2"/>
</struct>
- <struct name="Version">
+ <struct name="Version16">
<field type="CARD16" name="major"/>
<field type="CARD16" name="minor"/>
</struct>
+ <struct name="Version32">
+ <field type="CARD32" name="major"/>
+ <field type="CARD32" name="minor"/>
+ </struct>
<struct name="VisualID">
<field type="CARD32" name="id"/>
</struct>
@@ -153,7 +157,7 @@ authorization from the authors.
<struct name="ConnSetupReq">
<field type="CARD8" name="byte-order"/>
<pad bytes="1"/>
- <field type="Version" name="protocol-version"/>
+ <field type="Version16" 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">
@@ -172,7 +176,7 @@ authorization from the authors.
<!-- always 0 -> Failed -->
<field type="CARD8" name="status"/>
<field type="CARD8" name="reason-len"/>
- <field type="Version" name="protocol-version"/>
+ <field type="Version16" name="protocol-version"/>
<field type="CARD16" name="length"/>
<list type="char" name="reason">
<fieldref>reason-len</fieldref>
@@ -182,7 +186,7 @@ authorization from the authors.
<!-- always 1 -> Success -->
<field type="CARD8" name="status"/>
<pad bytes="1"/>
- <field type="Version" name="protocol-version"/>
+ <field type="Version16" name="protocol-version"/>
<field type="CARD16" name="length"/>
<field type="CARD32" name="release-number"/>
<field type="CARD32" name="resource-id-base"/>
More information about the xcb-commit
mailing list