summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Harris <pharris@opentext.com>2010-10-20 10:24:09 -0400
committerPeter Harris <pharris@opentext.com>2010-10-20 10:26:07 -0400
commit0ba74c7d503776ee133ee841b794a91d4a6c33a9 (patch)
tree1757c16c6a87061c19eb380334a8cf02622cedc0
parent476a3fdbc9f4f6256cd64f6683f4529bab1aecec (diff)
Revert "xproto.xml: turned valueparam in CreateWindow request into switch"
This reverts commit 9895cf562c5842813782ce494253c9127e699354. This is intended to be a temporary revert. When we are ready to migrate to switch, we should migrate all of the valueparams at the same time. Signed-off-by: Peter Harris <pharris@opentext.com>
-rw-r--r--src/xproto.xml75
1 files changed, 3 insertions, 72 deletions
diff --git a/src/xproto.xml b/src/xproto.xml
index 2d76efa..b6521c3 100644
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -813,14 +813,6 @@ authorization from the authors.
<item name="Static"> <value>10</value></item>
</enum>
- <enum name="BorderPixmap">
- <item name="CopyFromParent"><value>0</value></item>
- </enum>
-
- <enum name="ColorMap">
- <item name="CopyFromParent"><value>0</value></item>
- </enum>
-
<request name="CreateWindow" opcode="1">
<field type="CARD8" name="depth" />
<field type="WINDOW" name="wid" />
@@ -832,70 +824,9 @@ authorization from the authors.
<field type="CARD16" name="border_width" />
<field type="CARD16" name="class" enum="WindowClass" />
<field type="VISUALID" name="visual" />
- <field type="CARD32" name="value_mask" enum="CW" />
- <switch name="value_list">
- <fieldref>value_mask</fieldref>
- <bitcase>
- <enumref ref="CW">BackPixmap</enumref>
- <field name="background_pixmap" type="PIXMAP" altenum="BackPixmap" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">BackPixel</enumref>
- <field name="background_pixel" type="CARD32" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">BorderPixmap</enumref>
- <field name="border_pixmap" type="PIXMAP" altenum="BorderPixmap" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">BorderPixel</enumref>
- <field name="border_pixel" type="CARD32" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">BitGravity</enumref>
- <field name="bit_gravity" type="CARD32" enum="Gravity" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">WinGravity</enumref>
- <field name="win_gravity" type="CARD32" enum="Gravity" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">BackingStore</enumref>
- <field name="backing_store" type="CARD32" enum="BackingStore" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">BackingPlanes</enumref>
- <field name="backing_planes" type="CARD32" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">BackingPixel</enumref>
- <field name="backing_pixel" type="CARD32" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">OverrideRedirect</enumref>
- <field name="override_redirect" type="CARD32" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">SaveUnder</enumref>
- <field name="save_under" type="CARD32" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">EventMask</enumref>
- <field name="event_mask" type="CARD32" enum="EventMask" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">DontPropagate</enumref>
- <field name="dont_propagate" type="CARD32" enum="EventMask" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">Colormap</enumref>
- <field name="colormap" type="COLORMAP" altenum="ColorMap" />
- </bitcase>
- <bitcase>
- <enumref ref="CW">Cursor</enumref>
- <field name="cursor" type="CURSOR" altenum="Cursor" />
- </bitcase>
- </switch>
+ <valueparam value-mask-type="CARD32"
+ value-mask-name="value_mask"
+ value-list-name="value_list" />
</request>
<request name="ChangeWindowAttributes" opcode="2">