[Xcb-commit] Branch 'xspec' - 6 commits - xcb-proto
Alp Toker
alp at kemper.freedesktop.org
Thu Mar 30 00:19:01 PST 2006
xcb-proto/src/extensions/randr.xml | 8 +--
xcb-proto/src/extensions/record.xml | 1
xcb-proto/src/extensions/xprint.xml | 74 ++++++++++--------------------------
xcb-proto/src/extensions/xv.xml | 2
xcb-proto/src/xproto.xml | 38 ++++++++++++++++++
5 files changed, 65 insertions(+), 58 deletions(-)
New commits:
diff-tree d55e78fcb53a82fb48ba5e24a16f911ac3a36bbc (from 8b27231abbbd81075b73ab38d78cda856110fd22)
Author: Alp Toker <alp at atoker.com>
Date: Thu Mar 30 09:16:33 2006 +0100
Add CreateGC mask (based on protocol docs, not xlib)
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 461499c..d5da4d9 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -469,6 +469,31 @@ authorization from the authors.
<item name="top"/>
<item name="bottom"/>
</enum>
+<mask type="CARD32" name="GC">
+ <item name="function"/>
+ <item name="plane-mask"/>
+ <item name="foreground"/>
+ <item name="background"/>
+ <item name="line-width"/>
+ <item name="line-style"/>
+ <item name="cap-style"/>
+ <item name="join-style"/>
+ <item name="ï¬ll-style"/>
+ <item name="ï¬ll-rule"/>
+ <item name="tile"/>
+ <item name="stipple"/>
+ <item name="tile-stipple-x-origin"/>
+ <item name="tile-stipple-y-origin"/>
+ <item name="font"/>
+ <item name="subwindow-mode"/>
+ <item name="graphics-exposures"/>
+ <item name="clip-x-origin"/>
+ <item name="clip-y-origin"/>
+ <item name="clip-mask"/>
+ <item name="dash-offset"/>
+ <item name="dashes"/>
+ <item name="arc-mode"/>
+</mask>
<enum name="GFunction">
<item name="clear"/>
<item name="and"/>
diff-tree 8b27231abbbd81075b73ab38d78cda856110fd22 (from 50fb348cd0a286131ecbbb9f172a0f53c55154d5)
Author: Alp Toker <alp at atoker.com>
Date: Thu Mar 30 08:44:21 2006 +0100
Note cases where xspec deviates completely from X docs/headers
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index 6bf1408..ba33072 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -261,10 +261,12 @@ authorization from the authors.
</request>
<request name="SelectVideoNotify" number="10">
<field type="Drawable" name="drawable"/>
+ <!-- xspec: Updated for clarity; name was formerly onoff -->
<field type="bool" name="enabled"/>
</request>
<request name="SelectPortNotify" number="11">
<field type="Drawable" name="drawable"/>
+ <!-- xspec: Updated for clarity; name was formerly onoff -->
<field type="bool" name="enabled"/>
</request>
<request name="QueryBestSize" number="12">
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 5d2ecee..461499c 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -451,6 +451,7 @@ authorization from the authors.
<item name="hint"/>
</enum>
<enum type="byte" name="Visibility">
+ <!-- xspec: Updated for clarity; formerly {unobscured, partially-obscured, fully-obscured} -->
<item name="full"/>
<item name="partial"/>
<item name="none"/>
diff-tree 50fb348cd0a286131ecbbb9f172a0f53c55154d5 (from b3c8651ef44123f4a1a4e3d80cd7320f456dcf4f)
Author: Alp Toker <alp at atoker.com>
Date: Thu Mar 30 08:29:21 2006 +0100
ConfigureWindowStructure mask added manually for now
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 2c9edb3..5d2ecee 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -587,6 +587,16 @@ authorization from the authors.
<pad bytes="1"/>
<field type="Window" name="window"/>
</request>
+ <!-- TODO: merge this mask with ConfigureRequest fields -->
+ <mask type="CARD16" name="ConfigureWindowStructure">
+ <item name="x"/>
+ <item name="y"/>
+ <item name="width"/>
+ <item name="height"/>
+ <item name="border-width"/>
+ <item name="sibling"/>
+ <item name="stack-mode"/>
+ </mask>
<request name="ConfigureWindow" number="12">
<pad bytes="1"/>
<field type="Window" name="window"/>
diff-tree b3c8651ef44123f4a1a4e3d80cd7320f456dcf4f (from 6f652351ea45d5890987a820402f6ce5970f5b84)
Author: Alp Toker <alp at atoker.com>
Date: Thu Mar 30 08:10:01 2006 +0100
Fix override-redirect position in CW mask
diff --git a/xcb-proto/src/xproto.xml b/xcb-proto/src/xproto.xml
index 2490325..2c9edb3 100644
--- a/xcb-proto/src/xproto.xml
+++ b/xcb-proto/src/xproto.xml
@@ -507,10 +507,10 @@ authorization from the authors.
<item name="backing-store"/>
<item name="backing-planes"/>
<item name="backing-pixel"/>
+ <item name="override-redirect"/>
<item name="save-under"/>
<item name="event-mask"/>
<item name="do-not-propagate-mask"/>
- <item name="override-redirect"/>
<item name="colormap"/>
<item name="cursor"/>
</mask>
diff-tree 6f652351ea45d5890987a820402f6ce5970f5b84 (from f1cb7e3ef4208e4b34116f5f1bf4630adeb56a9e)
Author: Alp Toker <alp at atoker.com>
Date: Thu Mar 30 06:34:18 2006 +0100
Correct CS enum offset
diff --git a/xcb-proto/src/extensions/record.xml b/xcb-proto/src/extensions/record.xml
index 27640ec..ab241a2 100644
--- a/xcb-proto/src/extensions/record.xml
+++ b/xcb-proto/src/extensions/record.xml
@@ -60,6 +60,7 @@ authorization from the authors.
</mask>
<typedef oldname="CARD32" newname="ClientSpec"/>
<enum name="CS">
+ <item/>
<item name="current-clients"/>
<item name="future-clients"/>
<item name="all-clients"/>
diff-tree f1cb7e3ef4208e4b34116f5f1bf4630adeb56a9e (from 50a0ce93b7488b773b6a758bbb03bacc5332f27a)
Author: Alp Toker <alp at atoker.com>
Date: Thu Mar 30 06:31:16 2006 +0100
mask/enum cleanups; introduce anonymous item elements
diff --git a/xcb-proto/src/extensions/randr.xml b/xcb-proto/src/extensions/randr.xml
index e608b7f..87715bd 100644
--- a/xcb-proto/src/extensions/randr.xml
+++ b/xcb-proto/src/extensions/randr.xml
@@ -109,11 +109,9 @@ authorization from the authors.
</list>
</reply>
</request>
- <enum name="SM">
- <item name="screen-change-notify">
- <value>1</value>
- </item>
- </enum>
+ <mask name="SM">
+ <item name="screen-change-notify"/>
+ </mask>
<event name="ScreenChangeNotify" number="0">
<field type="CARD8" name="rotation"/>
<field type="Time" name="time"/>
diff --git a/xcb-proto/src/extensions/xprint.xml b/xcb-proto/src/extensions/xprint.xml
index f9844d5..9b7dcb1 100644
--- a/xcb-proto/src/extensions/xprint.xml
+++ b/xcb-proto/src/extensions/xprint.xml
@@ -45,69 +45,39 @@ authorization from the authors.
<typedef oldname="char" newname="STRING8"/>
<!-- "PrintGetDocumentData" -->
<enum name="GetDoc">
- <item name="finished">
- <value>0</value>
- </item>
- <item name="second-consumer">
- <value>1</value>
- </item>
+ <item name="finished"/>
+ <item name="second-consumer"/>
</enum>
<!-- Event Mask ("PrintSelectInput") -->
- <enum name="EvMask">
+ <mask name="EvMask">
+ <!--
<item name="no-event-mask">
<value>0x00000000</value>
</item>
- <item name="print-mask">
- <value>0x00000001</value>
- </item>
- <item name="attribute-mask">
- <value>0x00000002</value>
- </item>
- </enum>
+ -->
+ <item name="print-mask"/>
+ <item name="attribute-mask"/>
+ </mask>
<!-- "PrintNotify" detail -->
<enum name="Detail">
- <item name="start-job-notify">
- <value>1</value>
- </item>
- <item name="end-job-notify">
- <value>2</value>
- </item>
- <item name="start-doc-notify">
- <value>3</value>
- </item>
- <item name="end-doc-notify">
- <value>4</value>
- </item>
- <item name="start-page-notify">
- <value>5</value>
- </item>
- <item name="end-page-notify">
- <value>6</value>
- </item>
+ <item/>
+ <item name="start-job-notify"//>
+ <item name="end-job-notify"/>
+ <item name="start-doc-notify"/>
+ <item name="end-doc-notify"/>
+ <item name="start-page-notify"/>
+ <item name="end-page-notify"/>
</enum>
<!-- "AttributeNotify" detail -->
<enum name="Attr">
+ <item/>
<item name="job-attr">
- <value>1</value>
- </item>
- <item name="doc-attr">
- <value>2</value>
- </item>
- <item name="page-attr">
- <value>3</value>
- </item>
- <item name="printer-attr">
- <value>4</value>
- </item>
- <item name="server-attr">
- <value>5</value>
- </item>
- <item name="medium-attr">
- <value>6</value>
- </item>
- <item name="spooler-attr">
- <value>7</value>
- </item>
+ <item name="doc-attr"/>
+ <item name="page-attr"/>
+ <item name="printer-attr"/>
+ <item name="server-attr"/>
+ <item name="medium-attr"/>
+ <item name="spooler-attr"/>
</enum>
<!-- Requests -->
<request name="PrintQueryVersion" number="0">
More information about the xcb-commit
mailing list