<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" />
</list>
</struct>
- <struct name="SetupReq">
+ <struct name="SetupRequest">
<field type="CARD8" name="byte_order" />
<pad bytes="1" />
<field type="CARD16" name="protocol_major_version" />
</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">
<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>
</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" />
</request>
<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>
</reply>
</request>
- <enum name="Host">
+ <enum name="HostMode">
<item name="Insert"><value>0</value></item>
<item name="Delete"><value>1</value></item>
</enum>