X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxproto.xml;h=42a6852a19a2d3af7773557e1c5c5de534abd90b;hb=260881171221833f60545c259405886f0265cabd;hp=87dd76240430ec7088ae551cde727fb3bf6ccdd6;hpb=76ca2c0b1527541be59c344118c538ba055ad9d8;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xproto.xml b/src/xproto.xml
index 87dd762..42a6852 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" fixed_type="CARD32">
-      <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">
@@ -1365,8 +1296,8 @@ authorization from the authors.
     <reply>
       <field type="BOOL" name="same_screen" />
       <field type="WINDOW" name="child" altenum="Window" />
-      <field type="CARD16" name="dst_x" />
-      <field type="CARD16" name="dst_y" />
+      <field type="INT16" name="dst_x" />
+      <field type="INT16" name="dst_y" />
     </reply>
   </request>
 
@@ -1551,7 +1482,10 @@ authorization from the authors.
   <request name="SetFontPath" opcode="51">
     <pad bytes="1" />
     <field type="CARD16" name="font_qty" />
-    <list type="char" name="path" />
+    <pad bytes="2" />
+    <list type="STR" name="font">
+      <fieldref>font_qty</fieldref>
+    </list>
   </request>
 
   <request name="GetFontPath" opcode="52">
@@ -2224,6 +2158,7 @@ authorization from the authors.
     <field type="CARD8" name="keycode_count" />
     <field type="KEYCODE" name="first_keycode" />
     <field type="CARD8" name="keysyms_per_keycode" />
+    <pad bytes="2" />
     <list type="KEYSYM" name="keysyms">
       <op op="*">
         <fieldref>keycode_count</fieldref>
@@ -2363,7 +2298,7 @@ authorization from the authors.
     <field type="CARD8" name="family" enum="Family" />
     <pad bytes="1" />
     <field type="CARD16" name="address_len" />
-    <list type="char" name="address">
+    <list type="BYTE" name="address">
       <fieldref>address_len</fieldref>
     </list>
   </request>