Merge branch 'enum'

diff --combined src/xproto.xml
index 920285a,19539f5..6295dae
--- 1/src/xproto.xml
--- 2/src/xproto.xml
+++ b/src/xproto.xml
@@@ -987,13 -987,7 +987,13 @@@ authorization from the authors
        <field type="CARD32" name="value_len" />
        <pad bytes="12" />
        <list type="void" name="value">
 -        <fieldref>value_len</fieldref>
 +      <op op="*">
 +        <fieldref>value_len</fieldref>
 +        <op op="/">
 +          <fieldref>format</fieldref>
 +          <value>8</value>
 +        </op>
 +      </op>
        </list>
      </reply>
    </request>
@@@ -1248,6 -1242,7 +1248,7 @@@
      <item name="None">       <value>0</value></item>
      <item name="PointerRoot"><value>1</value></item>
      <item name="Parent">     <value>2</value></item>  <!-- revert_to only -->
+     <item name="FollowKeyboard"><value>3</value></item>  <!-- xinput extension only -->
    </enum>
  
    <request name="SetInputFocus" opcode="42">
@@@ -1498,7 -1493,7 +1499,7 @@@
    </enum>
  
    <enum name="JoinStyle">
 -    <item name="Mitre">     <value>0</value></item>
 +    <item name="Miter">     <value>0</value></item>
      <item name="Round">     <value>1</value></item>
      <item name="Bevel">     <value>2</value></item>
    </enum>