From e95bef0f6f989ed88082651e7b4035bd0b860b1c Mon Sep 17 00:00:00 2001
From: Daniel Martin <consume.noise@gmail.com>
Date: Mon, 5 Aug 2013 21:23:21 +0200
Subject: [proto] xproto: Replace valueparam with list in ConfigureWindow

Replace the valueparam in the ConfigureWindow request with a list. This
fixes bug #67782:
    xproto.xml: ConfigureWindow request with additional 'value_mask' \
                field
    https://bugs.freedesktop.org/show_bug.cgi?id=67782

Additionally, use the ConfigWindow enum in the value_mask field.

Signed-off-by: Daniel Martin <consume.noise@gmail.com>
---
 src/xproto.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/xproto.xml b/src/xproto.xml
index bf4dcbf..6285d0b 100644
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -1675,11 +1675,15 @@ <enum name="StackMode">
   <request name="ConfigureWindow" opcode="12">
     <pad bytes="1" />
     <field type="WINDOW" name="window" />
-    <field type="CARD16" name="value_mask" />
+    <field type="CARD16" name="value_mask" enum="ConfigWindow" />
     <pad bytes="2" />
-    <valueparam value-mask-type="CARD16"
-                value-mask-name="value_mask"
-                value-list-name="value_list" />
+    <list type="CARD32" name="value_list">
+      <!-- This list should be a switch, but can't
+           be due to compatibility issues. -->
+      <popcount>
+        <fieldref>value_mask</fieldref>
+      </popcount>
+    </list>
     <doc>
       <brief>Configures window attributes</brief>
       <description><![CDATA[
-- 
1.8.3.3