Merge branch 'master' of git+ssh://iano@git.freedesktop.org/git/xcb

diff --combined src/xproto.xml
index 8ccf1d9,6aba170..b4dfc20
--- 1/src/xproto.xml
--- 2/src/xproto.xml
+++ b/src/xproto.xml
@@@ -363,8 -363,6 +363,6 @@@ authorization from the authors
    <!-- The requests, in major number order. -->
    <!-- It is the caller's responsibility to free returned XCB*Rep objects. -->
  
-   <!-- FIXME: The ListFontsWithInfo request is not supported by XCB. -->
- 
    <enum name="WindowClass">
      <item name="CopyFromParent"><value>0</value></item>
      <item name="InputOutput">   <value>1</value></item>
@@@ -534,14 -532,6 +532,14 @@@
      <item name="Sibling">    <bit>5</bit></item>
      <item name="StackMode">  <bit>6</bit></item>
    </enum>
 +  
 +  <enum name="StackMode">
 +    <item name="Above">   <value>0</value></item>
 +    <item name="Below">   <value>1</value></item>
 +    <item name="TopIf">   <value>2</value></item>
 +    <item name="BottomIf"><value>3</value></item>
 +    <item name="Opposite"><value>4</value></item>
 +  </enum>
  
    <request name="ConfigureWindow" opcode="12">
      <pad bytes="1" />
@@@ -1069,7 -1059,7 +1067,7 @@@
      <item name="GraphicsExposures"> <bit>16</bit></item>
      <item name="ClipOriginX">       <bit>17</bit></item>
      <item name="ClipOriginY">       <bit>18</bit></item>
 -    <item name="Mask">              <bit>19</bit></item>
 +    <item name="ClipMask">          <bit>19</bit></item>
      <item name="DashOffset">        <bit>20</bit></item>
      <item name="DashList">          <bit>21</bit></item>
      <item name="ArcMode">           <bit>22</bit></item>
@@@ -1271,12 -1261,6 +1269,12 @@@
      <list type="ARC" name="arcs" />
    </request>
  
 +  <enum name="PolyShape">
 +    <item name="Complex">  <value>0</value></item>
 +    <item name="Nonconvex"><value>1</value></item>
 +    <item name="Convex">   <value>2</value></item>
 +  </enum>
 +
    <request name="FillPoly" opcode="69">
      <pad bytes="1" />
      <field type="DRAWABLE" name="drawable" />
@@@ -1386,11 -1370,6 +1384,11 @@@
      </list>
    </request>
  
 +  <enum name= "ColormapAlloc">
 +    <item name="None"><value>0</value></item>
 +    <item name="All"> <value>1</value></item>
 +  </enum>
 +
    <request name="CreateColormap" opcode="78">
      <field type="BYTE" name="alloc" />
      <field type="COLORMAP" name="mid" />