X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxproto.xml;h=5b7ea62ee42a18d5f03de1fc35af01e627610074;hb=c8129e1f19ceb2002c9764b94f03564600f13a8f;hp=d0c3b1faaa6291f5973fc3d506310d3d538df3ca;hpb=ab4393d3a63dde6fca2a167f7d6aaf64972b02f0;p=free-sw%2Fxcb%2Fproto

diff --git a/src/xproto.xml b/src/xproto.xml
index d0c3b1f..5b7ea62 100644
--- a/src/xproto.xml
+++ b/src/xproto.xml
@@ -47,35 +47,25 @@ authorization from the authors.
   
   <xidtype name="ATOM" />
   
-  <union name="DRAWABLE">
-    <field type="WINDOW" name="window" />
-    <field type="PIXMAP" name="pixmap" />
-  </union>
+  <xidunion name="DRAWABLE">
+    <type>WINDOW</type>
+    <type>PIXMAP</type>
+  </xidunion>
   
-  <union name="FONTABLE">
-    <field type="FONT" name="font" />
-    <field type="GCONTEXT" name="gcontext" />
-  </union>
+  <xidunion name="FONTABLE">
+    <type>FONT</type>
+    <type>GCONTEXT</type>
+  </xidunion>
   
-  <struct name="VISUALID">
-    <field type="CARD32" name="id" />
-  </struct>
+  <typedef oldname="CARD32" newname="VISUALID" />
 
-  <struct name="TIMESTAMP">
-    <field type="CARD32" name="id" />
-  </struct>
+  <typedef oldname="CARD32" newname="TIMESTAMP" />
 
-  <struct name="KEYSYM">
-    <field type="CARD32" name="id" />
-  </struct>
+  <typedef oldname="CARD32" newname="KEYSYM" />
 
-  <struct name="KEYCODE">
-    <field type="CARD8" name="id" />
-  </struct>
+  <typedef oldname="CARD8" newname="KEYCODE" />
 
-  <struct name="BUTTON">
-    <field type="CARD8" name="id" />
-  </struct>
+  <typedef oldname="CARD8" newname="BUTTON" />
 
   <struct name="POINT">
     <field type="INT16" name="x" />
@@ -159,7 +149,7 @@ authorization from the authors.
     </list>
   </struct>
 
-  <struct name="SetupReq">
+  <struct name="SetupRequest">
     <field type="CARD8" name="byte_order" />
     <pad bytes="1" />
     <field type="CARD16" name="protocol_major_version" />
@@ -259,6 +249,7 @@ authorization from the authors.
     <field type="INT16" name="event_y" />
     <field type="CARD16" name="state" />
     <field type="BOOL" name="same_screen" />
+    <pad bytes="1" />
   </event>
 
   <eventcopy name="KeyRelease" number="3" ref="KeyPress" />
@@ -284,6 +275,7 @@ authorization from the authors.
     <field type="INT16" name="event_y" />
     <field type="CARD16" name="state" />
     <field type="BOOL" name="same_screen" />
+    <pad bytes="1" />
   </event>
 
   <eventcopy name="ButtonRelease" number="5" ref="ButtonPress" />
@@ -306,6 +298,7 @@ authorization from the authors.
     <field type="INT16" name="event_y" />
     <field type="CARD16" name="state" />
     <field type="BOOL" name="same_screen" />
+    <pad bytes="1" />
   </event>
 
   <enum name="NotifyDetail">
@@ -347,6 +340,7 @@ authorization from the authors.
     <field type="BYTE" name="detail" />
     <field type="WINDOW" name="event" />
     <field type="BYTE" name="mode" />
+    <pad bytes="3" />
   </event>
 
   <eventcopy name="FocusOut" number="10" ref="FocusIn" />
@@ -363,6 +357,7 @@ authorization from the authors.
     <field type="CARD16" name="width" />
     <field type="CARD16" name="height" />
     <field type="CARD16" name="count" />
+    <pad bytes="2" />
   </event>
 
   <event name="GraphicsExposure" number="13">
@@ -375,6 +370,7 @@ authorization from the authors.
     <field type="CARD16" name="minor_opcode" />
     <field type="CARD16" name="count" />
     <field type="CARD8" name="major_opcode" />
+    <pad bytes="3" />
   </event>
 
   <event name="NoExposure" number="14">
@@ -382,6 +378,7 @@ authorization from the authors.
     <field type="DRAWABLE" name="drawable" />
     <field type="CARD16" name="minor_opcode" />
     <field type="CARD8" name="major_opcode" />
+    <pad bytes="1" />
   </event>
 
   <enum name="Visibility">
@@ -394,6 +391,7 @@ authorization from the authors.
     <pad bytes="1" />
     <field type="WINDOW" name="window" />
     <field type="BYTE" name="state" />
+    <pad bytes="3" />
   </event>
 
   <event name="CreateNotify" number="16">
@@ -406,6 +404,7 @@ authorization from the authors.
     <field type="CARD16" name="height" />
     <field type="CARD16" name="border_width" />
     <field type="BOOL" name="override_redirect" />
+    <pad bytes="1" />
   </event>
 
   <event name="DestroyNotify" number="17">
@@ -419,6 +418,7 @@ authorization from the authors.
     <field type="WINDOW" name="event" />
     <field type="WINDOW" name="window" />
     <field type="BOOL" name="from_configure" />
+    <pad bytes="3" />
   </event>
 
   <event name="MapNotify" number="19">
@@ -426,6 +426,7 @@ authorization from the authors.
     <field type="WINDOW" name="event" />
     <field type="WINDOW" name="window" />
     <field type="BOOL" name="override_redirect" />
+    <pad bytes="3" />
   </event>
 
   <event name="MapRequest" number="20">
@@ -442,6 +443,7 @@ authorization from the authors.
     <field type="INT16" name="x" />
     <field type="INT16" name="y" />
     <field type="BOOL" name="override_redirect" />
+    <pad bytes="3" />
   </event>
 
   <event name="ConfigureNotify" number="22">
@@ -455,6 +457,7 @@ authorization from the authors.
     <field type="CARD16" name="height" />
     <field type="CARD16" name="border_width" />
     <field type="BOOL" name="override_redirect" />
+    <pad bytes="1" />
   </event>
 
   <event name="ConfigureRequest" number="23">
@@ -496,6 +499,7 @@ authorization from the authors.
     <field type="WINDOW" name="window" />
     <pad bytes="4" />
     <field type="BYTE" name="place" />
+    <pad bytes="3" />
   </event>
 
   <eventcopy name="CirculateRequest" number="27" ref="CirculateNotify" />
@@ -511,6 +515,7 @@ authorization from the authors.
     <field type="ATOM" name="atom" />
     <field type="TIMESTAMP" name="time" />
     <field type="BYTE" name="state" />
+    <pad bytes="3" />
   </event>
 
   <event name="SelectionClear" number="29">
@@ -550,6 +555,7 @@ authorization from the authors.
     <field type="COLORMAP" name="colormap" />
     <field type="BOOL" name="new" />
     <field type="BYTE" name="state" />
+    <pad bytes="2" />
   </event>
 
   <union name="ClientMessageData">
@@ -578,6 +584,7 @@ authorization from the authors.
     <field type="BYTE" name="request" />
     <field type="KEYCODE" name="first_keycode" />
     <field type="CARD8" name="count" />
+    <pad bytes="1" />
   </event>
 
 
@@ -590,12 +597,14 @@ authorization from the authors.
     <field type="CARD32" name="bad_value" />
     <field type="CARD16" name="minor_opcode" />
     <field type="CARD8" name="major_opcode" />
+    <pad bytes="1" />
   </error>
 
   <error name="Value" number="2">
     <field type="CARD32" name="bad_value" />
     <field type="CARD16" name="minor_opcode" />
     <field type="CARD8" name="major_opcode" />
+    <pad bytes="1" />
   </error>
 
   <errorcopy name="Window" number="3" ref="Value" />
@@ -751,6 +760,7 @@ authorization from the authors.
       <field type="CARD32" name="all_event_masks" />
       <field type="CARD32" name="your_event_mask" />
       <field type="CARD16" name="do_not_propagate_mask" />
+      <pad bytes="2" />
     </reply>
   </request>
 
@@ -825,6 +835,7 @@ authorization from the authors.
     <field type="WINDOW" name="window" />
     <valueparam value-mask-type="CARD16"
                 value-mask-name="value_mask"
+                value-mask-pad="2"
                 value-list-name="value_list" />
   </request>
 
@@ -849,6 +860,7 @@ authorization from the authors.
       <field type="CARD16" name="width" />
       <field type="CARD16" name="height" />
       <field type="CARD16" name="border_width" />
+      <pad bytes="2" />
     </reply>
   </request>
 
@@ -998,8 +1010,8 @@ authorization from the authors.
   </request>
 
   <enum name="GrabMode">
-    <item name="Async"><value>0</value></item>
-    <item name="Sync"> <value>1</value></item>
+    <item name="Sync"> <value>0</value></item>
+    <item name="Async"><value>1</value></item>
   </enum>
 
   <enum name="GrabStatus">
@@ -1029,7 +1041,7 @@ authorization from the authors.
     <field type="TIMESTAMP" name="time" />
   </request>
 
-  <enum name="Button">
+  <enum name="ButtonIndex">
      <item name="Any"><value>0</value></item>
      <item name="1">  <value>1</value></item>
      <item name="2">  <value>2</value></item>
@@ -1063,6 +1075,7 @@ authorization from the authors.
     <field type="CURSOR" name="cursor" />
     <field type="TIMESTAMP" name="time" />
     <field type="CARD16" name="event_mask" />
+    <pad bytes="2" />
   </request>
 
   <request name="GrabKeyboard" opcode="31">
@@ -1071,6 +1084,7 @@ authorization from the authors.
     <field type="TIMESTAMP" name="time" />
     <field type="BYTE" name="pointer_mode" />
     <field type="BYTE" name="keyboard_mode" />
+    <pad bytes="2" />
     <reply>
       <field type="BYTE" name="status" />
     </reply>
@@ -1093,12 +1107,14 @@ authorization from the authors.
     <field type="KEYCODE" name="key" />
     <field type="CARD8" name="pointer_mode" />
     <field type="CARD8" name="keyboard_mode" />
+    <pad bytes="3" />
   </request>
 
   <request name="UngrabKey" opcode="34">
-    <field type="CARD8" name="key" />
+    <field type="KEYCODE" name="key" />
     <field type="WINDOW" name="grab_window" />
     <field type="CARD16" name="modifiers" />
+    <pad bytes="2" />
   </request>
 
   <enum name="Allow">
@@ -1133,6 +1149,7 @@ authorization from the authors.
       <field type="INT16" name="win_x" />
       <field type="INT16" name="win_y" />
       <field type="CARD16" name="mask" />
+      <pad bytes="2" />
     </reply>
   </request>
 
@@ -1214,6 +1231,7 @@ authorization from the authors.
     <pad bytes="1" />
     <field type="FONT" name="fid" />
     <field type="CARD16" name="name_len" />
+    <pad bytes="2" />
     <list type="char" name="name">
       <fieldref>name_len</fieldref>
     </list>
@@ -1405,22 +1423,22 @@ authorization from the authors.
 
   <!-- GC Function values -->
   <enum name="GX">
-    <item name="clear">       <value>0x0</value></item>
-    <item name="and">         <value>0x1</value></item>
-    <item name="andReverse">  <value>0x2</value></item>
-    <item name="copy">        <value>0x3</value></item>
-    <item name="andInverted"> <value>0x4</value></item>
-    <item name="noop">        <value>0x5</value></item>
-    <item name="xor">         <value>0x6</value></item>
-    <item name="or">          <value>0x7</value></item>
-    <item name="nor">         <value>0x8</value></item>
-    <item name="equiv">       <value>0x9</value></item>
-    <item name="invert">      <value>0xa</value></item>
-    <item name="orReverse">   <value>0xb</value></item>
-    <item name="copyInverted"><value>0xc</value></item>
-    <item name="orInverted">  <value>0xd</value></item>
-    <item name="nand">        <value>0xe</value></item>
-    <item name="set">         <value>0xf</value></item>
+    <item name="clear">       <value>0</value></item>
+    <item name="and">         <value>1</value></item>
+    <item name="andReverse">  <value>2</value></item>
+    <item name="copy">        <value>3</value></item>
+    <item name="andInverted"> <value>4</value></item>
+    <item name="noop">        <value>5</value></item>
+    <item name="xor">         <value>6</value></item>
+    <item name="or">          <value>7</value></item>
+    <item name="nor">         <value>8</value></item>
+    <item name="equiv">       <value>9</value></item>
+    <item name="invert">      <value>10</value></item>
+    <item name="orReverse">   <value>11</value></item>
+    <item name="copyInverted"><value>12</value></item>
+    <item name="orInverted">  <value>13</value></item>
+    <item name="nand">        <value>14</value></item>
+    <item name="set">         <value>15</value></item>
   </enum>
 
   <enum name="LineStyle">
@@ -1431,8 +1449,8 @@ authorization from the authors.
 
   <enum name="CapStyle">
     <item name="NotLast">   <value>0</value></item>
-    <item name="Cap">       <value>1</value></item>
-    <item name="Butt">      <value>2</value></item>
+    <item name="Butt">      <value>1</value></item>
+    <item name="Round">     <value>2</value></item>
     <item name="Projecting"><value>3</value></item>
   </enum>
 
@@ -1559,7 +1577,8 @@ authorization from the authors.
     <item name="Previous"><value>1</value></item>
   </enum>
 
-  <request name="PolyPoint" opcode="64" combine-adjacent="true">
+  <!-- combine-adjacent doesn't work for mode==Relative -->
+  <request name="PolyPoint" opcode="64">
     <field type="BYTE" name="coordinate_mode" />
     <field type="DRAWABLE" name="drawable" />
     <field type="GCONTEXT" name="gc" />
@@ -1618,6 +1637,7 @@ authorization from the authors.
     <field type="GCONTEXT" name="gc" />
     <field type="CARD8" name="shape" />
     <field type="CARD8" name="coordinate_mode" />
+    <pad bytes="2" />
     <list type="POINT" name="points" />
   </request>
 
@@ -1651,6 +1671,7 @@ authorization from the authors.
     <field type="INT16" name="dst_y" />
     <field type="CARD8" name="left_pad" />
     <field type="CARD8" name="depth" />
+    <pad bytes="2" />
     <list type="BYTE" name="data" />
   </request>
 
@@ -1768,6 +1789,7 @@ authorization from the authors.
     <field type="CARD16" name="red" />
     <field type="CARD16" name="green" />
     <field type="CARD16" name="blue" />
+    <pad bytes="2" />
     <reply>
       <pad bytes="1" />
       <field type="CARD16" name="red" />
@@ -1782,6 +1804,7 @@ authorization from the authors.
     <pad bytes="1" />
     <field type="COLORMAP" name="cmap" />
     <field type="CARD16" name="name_len" />
+    <pad bytes="2" />
     <list type="char" name="name">
       <fieldref>name_len</fieldref>
     </list>
@@ -1870,6 +1893,7 @@ authorization from the authors.
     <field type="COLORMAP" name="cmap" />
     <field type="CARD32" name="pixel" />
     <field type="CARD16" name="name_len" />
+    <pad bytes="2" />
     <list type="char" name="name">
       <fieldref>name_len</fieldref>
     </list>
@@ -1900,6 +1924,7 @@ authorization from the authors.
     <pad bytes="1" />
     <field type="COLORMAP" name="cmap" />
     <field type="CARD16" name="name_len" />
+    <pad bytes="2" />
     <list type="char" name="name">
       <fieldref>name_len</fieldref>
     </list>
@@ -2023,10 +2048,7 @@ authorization from the authors.
       <field type="BYTE" name="keysyms_per_keycode" />
       <pad bytes="24" />
       <list type="KEYSYM" name="keysyms">
-        <op op="*">
-          <fieldref>length</fieldref>
-          <value>4</value>
-        </op>
+        <fieldref>length</fieldref>
       </list>
     </reply>
   </request>
@@ -2092,6 +2114,7 @@ authorization from the authors.
       <field type="CARD16" name="acceleration_numerator" />
       <field type="CARD16" name="acceleration_denominator" />
       <field type="CARD16" name="threshold" />
+      <pad bytes="18" />
     </reply>
   </request>
 
@@ -2125,10 +2148,11 @@ authorization from the authors.
       <field type="CARD16" name="interval" />
       <field type="BYTE" name="prefer_blanking" />
       <field type="BYTE" name="allow_exposures" />
+      <pad bytes="18" />
     </reply>
   </request>
 
-  <enum name="Host">
+  <enum name="HostMode">
     <item name="Insert"><value>0</value></item>
     <item name="Delete"><value>1</value></item>
   </enum>
@@ -2201,6 +2225,7 @@ authorization from the authors.
   </request>
 
   <request name="RotateProperties" opcode="114">
+    <pad bytes="1" />
     <field type="WINDOW" name="window" />
     <field type="CARD16" name="atoms_len" />
     <field type="INT16" name="delta" />