aboutsummaryrefslogtreecommitdiff
path: root/libxcb/xcb-proto/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-10-16 11:30:08 +0200
committermarha <marha@users.sourceforge.net>2013-10-16 11:30:08 +0200
commit56e12b1310b1b52d00bc27e919d915255af5bf03 (patch)
tree19379a18fe9a678a109397837339820892101e4b /libxcb/xcb-proto/src
parentc5883f8af060c0a300a29e732e8bb893bc8e0eca (diff)
parent9e23b44bfe1e6e85231b1c07d945cadf0c868648 (diff)
downloadvcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.tar.gz
vcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.tar.bz2
vcxsrv-56e12b1310b1b52d00bc27e919d915255af5bf03.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig libxcb libxcb/xcb-proto xserver mesa pixman xkbcomp git update 16 oct 2013 Conflicts: mesalib/src/mesa/drivers/dri/common/drisw_util.c pixman/pixman/pixman-mmx.c
Diffstat (limited to 'libxcb/xcb-proto/src')
-rw-r--r--libxcb/xcb-proto/src/composite.xml4
-rw-r--r--libxcb/xcb-proto/src/damage.xml8
-rw-r--r--libxcb/xcb-proto/src/dpms.xml8
-rw-r--r--libxcb/xcb-proto/src/dri2.xml26
-rw-r--r--libxcb/xcb-proto/src/randr.xml9
-rw-r--r--libxcb/xcb-proto/src/render.xml140
-rw-r--r--libxcb/xcb-proto/src/screensaver.xml14
-rw-r--r--libxcb/xcb-proto/src/shape.xml16
-rw-r--r--libxcb/xcb-proto/src/sync.xml18
-rw-r--r--libxcb/xcb-proto/src/xcb.xsd5
-rw-r--r--libxcb/xcb-proto/src/xevie.xml4
-rw-r--r--libxcb/xcb-proto/src/xfixes.xml22
-rw-r--r--libxcb/xcb-proto/src/xinput.xml112
-rw-r--r--libxcb/xcb-proto/src/xkb.xml4
-rw-r--r--libxcb/xcb-proto/src/xproto.xml136
-rw-r--r--libxcb/xcb-proto/src/xv.xml34
16 files changed, 282 insertions, 278 deletions
diff --git a/libxcb/xcb-proto/src/composite.xml b/libxcb/xcb-proto/src/composite.xml
index 535a0eecf..86de14629 100644
--- a/libxcb/xcb-proto/src/composite.xml
+++ b/libxcb/xcb-proto/src/composite.xml
@@ -32,8 +32,8 @@ authorization from the authors.
<import>xfixes</import>
<enum name="Redirect">
- <item name="Automatic" />
- <item name="Manual" />
+ <item name="Automatic"> <value>0</value> </item>
+ <item name="Manual"> <value>1</value> </item>
</enum>
<request name="QueryVersion" opcode="0">
diff --git a/libxcb/xcb-proto/src/damage.xml b/libxcb/xcb-proto/src/damage.xml
index 9c5cde5b6..c04721d1e 100644
--- a/libxcb/xcb-proto/src/damage.xml
+++ b/libxcb/xcb-proto/src/damage.xml
@@ -35,10 +35,10 @@ authorization from the authors.
<xidtype name="DAMAGE" />
<enum name="ReportLevel">
- <item name="RawRectangles" />
- <item name="DeltaRectangles" />
- <item name="BoundingBox" />
- <item name="NonEmpty" />
+ <item name="RawRectangles"> <value>0</value> </item>
+ <item name="DeltaRectangles"> <value>1</value> </item>
+ <item name="BoundingBox"> <value>2</value> </item>
+ <item name="NonEmpty"> <value>3</value> </item>
</enum>
<error name="BadDamage" number="0" />
diff --git a/libxcb/xcb-proto/src/dpms.xml b/libxcb/xcb-proto/src/dpms.xml
index 0c2ac2027..55812845f 100644
--- a/libxcb/xcb-proto/src/dpms.xml
+++ b/libxcb/xcb-proto/src/dpms.xml
@@ -66,10 +66,10 @@ authorization from the authors.
<request name="Disable" opcode="5" />
<enum name="DPMSMode">
- <item name="On" />
- <item name="Standby" />
- <item name="Suspend" />
- <item name="Off" />
+ <item name="On"> <value>0</value> </item>
+ <item name="Standby"> <value>1</value> </item>
+ <item name="Suspend"> <value>2</value> </item>
+ <item name="Off"> <value>3</value> </item>
</enum>
<request name="ForceLevel" opcode="6">
diff --git a/libxcb/xcb-proto/src/dri2.xml b/libxcb/xcb-proto/src/dri2.xml
index 508e4c1fc..0160c6ba8 100644
--- a/libxcb/xcb-proto/src/dri2.xml
+++ b/libxcb/xcb-proto/src/dri2.xml
@@ -32,22 +32,22 @@ authorization from the authors.
<import>xproto</import>
<enum name="Attachment">
- <item name="BufferFrontLeft" />
- <item name="BufferBackLeft" />
- <item name="BufferFrontRight" />
- <item name="BufferBackRight" />
- <item name="BufferDepth" />
- <item name="BufferStencil" />
- <item name="BufferAccum" />
- <item name="BufferFakeFrontLeft" />
- <item name="BufferFakeFrontRight" />
- <item name="BufferDepthStencil" />
- <item name="BufferHiz" />
+ <item name="BufferFrontLeft"> <value>0</value> </item>
+ <item name="BufferBackLeft"> <value>1</value> </item>
+ <item name="BufferFrontRight"> <value>2</value> </item>
+ <item name="BufferBackRight"> <value>3</value> </item>
+ <item name="BufferDepth"> <value>4</value> </item>
+ <item name="BufferStencil"> <value>5</value> </item>
+ <item name="BufferAccum"> <value>6</value> </item>
+ <item name="BufferFakeFrontLeft"> <value>7</value> </item>
+ <item name="BufferFakeFrontRight"> <value>8</value> </item>
+ <item name="BufferDepthStencil"> <value>9</value> </item>
+ <item name="BufferHiz"> <value>10</value> </item>
</enum>
<enum name="DriverType">
- <item name="DRI" />
- <item name="VDPAU" />
+ <item name="DRI"> <value>0</value> </item>
+ <item name="VDPAU"> <value>1</value> </item>
</enum>
<enum name="EventType">
diff --git a/libxcb/xcb-proto/src/randr.xml b/libxcb/xcb-proto/src/randr.xml
index 1ec3234fb..d9192b216 100644
--- a/libxcb/xcb-proto/src/randr.xml
+++ b/libxcb/xcb-proto/src/randr.xml
@@ -248,9 +248,9 @@ authorization from the authors.
<!-- for GetOutputInfo.connection -->
<enum name="Connection">
- <item name="Connected" />
- <item name="Disconnected" />
- <item name="Unknown" />
+ <item name="Connected"> <value>0</value> </item>
+ <item name="Disconnected"> <value>1</value> </item>
+ <item name="Unknown"> <value>2</value> </item>
</enum>
<request name="GetOutputInfo" opcode="9">
@@ -752,11 +752,10 @@ authorization from the authors.
<field type="BOOL" name="pending" />
<pad bytes="2" />
<reply>
- <pad bytes="1" />
<field type="CARD8" name="format" />
<field type="ATOM" name="type" /> <!-- None -->
<field type="CARD32" name="bytes_after" />
- <field type="CARD16" name="num_items" />
+ <field type="CARD32" name="num_items" />
<pad bytes="12" />
<list type="void" name="data">
<op op="*">
diff --git a/libxcb/xcb-proto/src/render.xml b/libxcb/xcb-proto/src/render.xml
index 9667fbeb6..55b73f7b8 100644
--- a/libxcb/xcb-proto/src/render.xml
+++ b/libxcb/xcb-proto/src/render.xml
@@ -11,84 +11,84 @@ for licensing information.
<import>xproto</import>
<enum name="PictType">
- <item name="Indexed" />
- <item name="Direct" />
+ <item name="Indexed"> <value>0</value> </item>
+ <item name="Direct"> <value>1</value> </item>
</enum>
<enum name="Picture">
- <item name="None" />
+ <item name="None"> <value>0</value> </item>
</enum>
<!-- Disjoint* and Conjoint* are new in version 0.2 -->
<!-- PDF blend modes are new in version 0.11 -->
<enum name="PictOp">
- <item name="Clear" />
- <item name="Src" />
- <item name="Dst" />
- <item name="Over" />
- <item name="OverReverse" />
- <item name="In" />
- <item name="InReverse" />
- <item name="Out" />
- <item name="OutReverse" />
- <item name="Atop" />
- <item name="AtopReverse" />
- <item name="Xor" />
- <item name="Add" />
- <item name="Saturate" />
+ <item name="Clear"> <value>0</value> </item>
+ <item name="Src"> <value>1</value> </item>
+ <item name="Dst"> <value>2</value> </item>
+ <item name="Over"> <value>3</value> </item>
+ <item name="OverReverse"> <value>4</value> </item>
+ <item name="In"> <value>5</value> </item>
+ <item name="InReverse"> <value>6</value> </item>
+ <item name="Out"> <value>7</value> </item>
+ <item name="OutReverse"> <value>8</value> </item>
+ <item name="Atop"> <value>9</value> </item>
+ <item name="AtopReverse"> <value>10</value> </item>
+ <item name="Xor"> <value>11</value> </item>
+ <item name="Add"> <value>12</value> </item>
+ <item name="Saturate"> <value>13</value> </item>
- <item name="DisjointClear"><value>16</value></item>
- <item name="DisjointSrc" />
- <item name="DisjointDst" />
- <item name="DisjointOver" />
- <item name="DisjointOverReverse" />
- <item name="DisjointIn" />
- <item name="DisjointInReverse" />
- <item name="DisjointOut" />
- <item name="DisjointOutReverse" />
- <item name="DisjointAtop" />
- <item name="DisjointAtopReverse" />
- <item name="DisjointXor" />
+ <item name="DisjointClear"> <value>16</value></item>
+ <item name="DisjointSrc"> <value>17</value> </item>
+ <item name="DisjointDst"> <value>18</value> </item>
+ <item name="DisjointOver"> <value>19</value> </item>
+ <item name="DisjointOverReverse"> <value>20</value> </item>
+ <item name="DisjointIn"> <value>21</value> </item>
+ <item name="DisjointInReverse"> <value>22</value> </item>
+ <item name="DisjointOut"> <value>23</value> </item>
+ <item name="DisjointOutReverse"> <value>24</value> </item>
+ <item name="DisjointAtop"> <value>25</value> </item>
+ <item name="DisjointAtopReverse"> <value>26</value> </item>
+ <item name="DisjointXor"> <value>27</value> </item>
- <item name="ConjointClear"><value>32</value></item>
- <item name="ConjointSrc" />
- <item name="ConjointDst" />
- <item name="ConjointOver" />
- <item name="ConjointOverReverse" />
- <item name="ConjointIn" />
- <item name="ConjointInReverse" />
- <item name="ConjointOut" />
- <item name="ConjointOutReverse" />
- <item name="ConjointAtop" />
- <item name="ConjointAtopReverse" />
- <item name="ConjointXor" />
+ <item name="ConjointClear"> <value>32</value></item>
+ <item name="ConjointSrc"> <value>33</value> </item>
+ <item name="ConjointDst"> <value>34</value> </item>
+ <item name="ConjointOver"> <value>35</value> </item>
+ <item name="ConjointOverReverse"> <value>36</value> </item>
+ <item name="ConjointIn"> <value>37</value> </item>
+ <item name="ConjointInReverse"> <value>38</value> </item>
+ <item name="ConjointOut"> <value>39</value> </item>
+ <item name="ConjointOutReverse"> <value>40</value> </item>
+ <item name="ConjointAtop"> <value>41</value> </item>
+ <item name="ConjointAtopReverse"> <value>42</value> </item>
+ <item name="ConjointXor"> <value>43</value> </item>
<!-- PDF blend modes are new in version 0.11 -->
- <item name="Multiply"><value>48</value></item>
- <item name="Screen" />
- <item name="Overlay" />
- <item name="Darken" />
- <item name="Lighten" />
- <item name="ColorDodge" />
- <item name="ColorBurn" />
- <item name="HardLight" />
- <item name="SoftLight" />
- <item name="Difference" />
- <item name="Exclusion" />
- <item name="HSLHue" />
- <item name="HSLSaturation" />
- <item name="HSLColor" />
- <item name="HSLLuminosity" />
+ <item name="Multiply"> <value>48</value></item>
+ <item name="Screen"> <value>49</value> </item>
+ <item name="Overlay"> <value>50</value> </item>
+ <item name="Darken"> <value>51</value> </item>
+ <item name="Lighten"> <value>52</value> </item>
+ <item name="ColorDodge"> <value>53</value> </item>
+ <item name="ColorBurn"> <value>54</value> </item>
+ <item name="HardLight"> <value>55</value> </item>
+ <item name="SoftLight"> <value>56</value> </item>
+ <item name="Difference"> <value>57</value> </item>
+ <item name="Exclusion"> <value>58</value> </item>
+ <item name="HSLHue"> <value>59</value> </item>
+ <item name="HSLSaturation"> <value>60</value> </item>
+ <item name="HSLColor"> <value>61</value> </item>
+ <item name="HSLLuminosity"> <value>62</value> </item>
</enum>
<enum name="PolyEdge">
- <item name="Sharp" />
- <item name="Smooth" />
+ <item name="Sharp"> <value>0</value> </item>
+ <item name="Smooth"> <value>1</value> </item>
</enum>
<enum name="PolyMode">
- <item name="Precise" />
- <item name="Imprecise" />
+ <item name="Precise"> <value>0</value> </item>
+ <item name="Imprecise"> <value>1</value> </item>
</enum>
<enum name="CP">
@@ -108,20 +108,20 @@ for licensing information.
</enum>
<enum name="SubPixel">
- <item name="Unknown" />
- <item name="HorizontalRGB" />
- <item name="HorizontalBGR" />
- <item name="VerticalRGB" />
- <item name="VerticalBGR" />
- <item name="None" />
+ <item name="Unknown"> <value>0</value> </item>
+ <item name="HorizontalRGB"> <value>1</value> </item>
+ <item name="HorizontalBGR"> <value>2</value> </item>
+ <item name="VerticalRGB"> <value>3</value> </item>
+ <item name="VerticalBGR"> <value>4</value> </item>
+ <item name="None"> <value>5</value> </item>
</enum>
<!-- Extended repeat attributes introduced in 0.10 -->
<enum name="Repeat">
- <item name="None" />
- <item name="Normal" />
- <item name="Pad" />
- <item name="Reflect" />
+ <item name="None"> <value>0</value> </item>
+ <item name="Normal"> <value>1</value> </item>
+ <item name="Pad"> <value>2</value> </item>
+ <item name="Reflect"> <value>3</value> </item>
</enum>
<typedef oldname="CARD32" newname="GLYPH" />
diff --git a/libxcb/xcb-proto/src/screensaver.xml b/libxcb/xcb-proto/src/screensaver.xml
index 7449c0a0b..491869e81 100644
--- a/libxcb/xcb-proto/src/screensaver.xml
+++ b/libxcb/xcb-proto/src/screensaver.xml
@@ -36,9 +36,9 @@ Draft Standard Version 1.1
<import>xproto</import>
<enum name="Kind">
- <item name="Blanked" />
- <item name="Internal" />
- <item name="External" />
+ <item name="Blanked"> <value>0</value> </item>
+ <item name="Internal"> <value>1</value> </item>
+ <item name="External"> <value>2</value> </item>
</enum>
<enum name="Event">
@@ -47,10 +47,10 @@ Draft Standard Version 1.1
</enum>
<enum name="State">
- <item name="Off" />
- <item name="On" />
- <item name="Cycle" />
- <item name="Disabled" />
+ <item name="Off"> <value>0</value> </item>
+ <item name="On"> <value>1</value> </item>
+ <item name="Cycle"> <value>2</value> </item>
+ <item name="Disabled"> <value>3</value> </item>
</enum>
<!-- Errors -->
diff --git a/libxcb/xcb-proto/src/shape.xml b/libxcb/xcb-proto/src/shape.xml
index c128ade32..d75549e05 100644
--- a/libxcb/xcb-proto/src/shape.xml
+++ b/libxcb/xcb-proto/src/shape.xml
@@ -34,18 +34,18 @@ authorization from the authors.
<!-- Shape attributes of type OP. -->
<enum name="SO">
- <item name="Set" />
- <item name="Union" />
- <item name="Intersect" />
- <item name="Subtract" />
- <item name="Invert" />
+ <item name="Set"> <value>0</value> </item>
+ <item name="Union"> <value>1</value> </item>
+ <item name="Intersect"> <value>2</value> </item>
+ <item name="Subtract"> <value>3</value> </item>
+ <item name="Invert"> <value>4</value> </item>
</enum>
<!-- Shape attributes of type KIND. -->
<enum name="SK">
- <item name="Bounding" />
- <item name="Clip" />
- <item name="Input" /> <!-- added in version 1.1 -->
+ <item name="Bounding"> <value>0</value> </item>
+ <item name="Clip"> <value>1</value> </item>
+ <item name="Input"> <value>2</value> </item> <!-- added in version 1.1 -->
</enum>
<event name="Notify" number="0">
diff --git a/libxcb/xcb-proto/src/sync.xml b/libxcb/xcb-proto/src/sync.xml
index 8a5194752..7bcf0ae32 100644
--- a/libxcb/xcb-proto/src/sync.xml
+++ b/libxcb/xcb-proto/src/sync.xml
@@ -11,9 +11,9 @@ for licensing information.
<xidtype name="ALARM" />
<enum name="ALARMSTATE">
- <item name="Active" />
- <item name="Inactive" />
- <item name="Destroyed" />
+ <item name="Active"> <value>0</value> </item>
+ <item name="Inactive"> <value>1</value> </item>
+ <item name="Destroyed"> <value>2</value> </item>
</enum>
<xidtype name="COUNTER" />
@@ -21,15 +21,15 @@ for licensing information.
<xidtype name="FENCE" />
<enum name="TESTTYPE">
- <item name="PositiveTransition" />
- <item name="NegativeTransition" />
- <item name="PositiveComparison" />
- <item name="NegativeComparison" />
+ <item name="PositiveTransition"> <value>0</value> </item>
+ <item name="NegativeTransition"> <value>1</value> </item>
+ <item name="PositiveComparison"> <value>2</value> </item>
+ <item name="NegativeComparison"> <value>3</value> </item>
</enum>
<enum name="VALUETYPE">
- <item name="Absolute" />
- <item name="Relative" />
+ <item name="Absolute"> <value>0</value> </item>
+ <item name="Relative"> <value>1</value> </item>
</enum>
<enum name="CA">
diff --git a/libxcb/xcb-proto/src/xcb.xsd b/libxcb/xcb-proto/src/xcb.xsd
index 819495b95..7a9c80018 100644
--- a/libxcb/xcb-proto/src/xcb.xsd
+++ b/libxcb/xcb-proto/src/xcb.xsd
@@ -353,7 +353,10 @@ authorization from the authors.
<xsd:sequence minOccurs="1" maxOccurs="unbounded">
<xsd:element name="item">
<xsd:complexType>
- <xsd:group ref="expression" minOccurs="0" maxOccurs="1" />
+ <xsd:choice minOccurs="1" maxOccurs="1">
+ <xsd:element name="value" type="dec-or-hex-integer" />
+ <xsd:element name="bit" type="xsd:integer" />
+ </xsd:choice>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
diff --git a/libxcb/xcb-proto/src/xevie.xml b/libxcb/xcb-proto/src/xevie.xml
index 222b412e4..bafa9900b 100644
--- a/libxcb/xcb-proto/src/xevie.xml
+++ b/libxcb/xcb-proto/src/xevie.xml
@@ -55,8 +55,8 @@ authorization from the authors.
</request>
<enum name="Datatype">
- <item name="Unmodified" />
- <item name="Modified" />
+ <item name="Unmodified"> <value>0</value> </item>
+ <item name="Modified"> <value>1</value> </item>
</enum>
<!-- The Send request needs to send an arbitrary Event; this type is used
diff --git a/libxcb/xcb-proto/src/xfixes.xml b/libxcb/xcb-proto/src/xfixes.xml
index 7b9be170b..c5cba352a 100644
--- a/libxcb/xcb-proto/src/xfixes.xml
+++ b/libxcb/xcb-proto/src/xfixes.xml
@@ -44,18 +44,18 @@ authorization from the authors.
</request>
<enum name="SaveSetMode">
- <item name="Insert" />
- <item name="Delete" />
+ <item name="Insert"> <value>0</value> </item>
+ <item name="Delete"> <value>1</value> </item>
</enum>
<enum name="SaveSetTarget">
- <item name="Nearest" />
- <item name="Root" />
+ <item name="Nearest"> <value>0</value> </item>
+ <item name="Root"> <value>1</value> </item>
</enum>
<enum name="SaveSetMapping">
- <item name="Map" />
- <item name="Unmap" />
+ <item name="Map"> <value>0</value> </item>
+ <item name="Unmap"> <value>1</value> </item>
</enum>
<request name="ChangeSaveSet" opcode="1">
@@ -67,9 +67,9 @@ authorization from the authors.
</request>
<enum name="SelectionEvent">
- <item name="SetSelectionOwner" />
- <item name="SelectionWindowDestroy" />
- <item name="SelectionClientClose" />
+ <item name="SetSelectionOwner"> <value>0</value> </item>
+ <item name="SelectionWindowDestroy"> <value>1</value> </item>
+ <item name="SelectionClientClose"> <value>2</value> </item>
</enum>
<enum name="SelectionEventMask">
@@ -95,7 +95,7 @@ authorization from the authors.
</request>
<enum name="CursorNotify">
- <item name="DisplayCursor" />
+ <item name="DisplayCursor"> <value>0</value> </item>
</enum>
<enum name="CursorNotifyMask">
@@ -143,7 +143,7 @@ authorization from the authors.
<error name="BadRegion" number="0" />
<enum name="Region">
- <item name="None" />
+ <item name="None"> <value>0</value> </item>
</enum>
<request name="CreateRegion" opcode="5">
diff --git a/libxcb/xcb-proto/src/xinput.xml b/libxcb/xcb-proto/src/xinput.xml
index cd1a39788..e62b7cb74 100644
--- a/libxcb/xcb-proto/src/xinput.xml
+++ b/libxcb/xcb-proto/src/xinput.xml
@@ -397,12 +397,12 @@ authorization from the authors.
<!-- AllowDeviceEvents -->
<enum name="DeviceInputMode">
- <item name="AsyncThisDevice" />
- <item name="SyncThisDevice" />
- <item name="ReplayThisDevice" />
- <item name="AsyncOtherDevices" />
- <item name="AsyncAll" />
- <item name="SyncAll" />
+ <item name="AsyncThisDevice"> <value>0</value> </item>
+ <item name="SyncThisDevice"> <value>1</value> </item>
+ <item name="ReplayThisDevice"> <value>2</value> </item>
+ <item name="AsyncOtherDevices"> <value>3</value> </item>
+ <item name="AsyncAll"> <value>4</value> </item>
+ <item name="SyncAll"> <value>5</value> </item>
</enum>
<request name="AllowDeviceEvents" opcode="19">
@@ -437,12 +437,12 @@ authorization from the authors.
<!-- GetFeedbackControl -->
<enum name="FeedbackClass">
- <item name="Keyboard" />
- <item name="Pointer" />
- <item name="String" />
- <item name="Integer" />
- <item name="Led" />
- <item name="Bell" />
+ <item name="Keyboard"> <value>0</value> </item>
+ <item name="Pointer"> <value>1</value> </item>
+ <item name="String"> <value>2</value> </item>
+ <item name="Integer"> <value>3</value> </item>
+ <item name="Led"> <value>4</value> </item>
+ <item name="Bell"> <value>5</value> </item>
</enum>
<struct name="KbdFeedbackState">
@@ -1099,8 +1099,8 @@ authorization from the authors.
<!-- XIQueryPointer -->
<enum name="Device">
- <item name="All" />
- <item name="AllMaster" />
+ <item name="All"> <value>0</value> </item>
+ <item name="AllMaster"> <value>1</value> </item>
</enum>
<struct name="GroupInfo">
@@ -1463,8 +1463,8 @@ authorization from the authors.
<!-- XIGrabDevice -->
<enum name="GrabOwner">
- <item name="NoOwner" />
- <item name="Owner" />
+ <item name="NoOwner"> <value>0</value> </item>
+ <item name="Owner"> <value>1</value> </item>
</enum>
<request name="XIGrabDevice" opcode="51">
@@ -1498,14 +1498,14 @@ authorization from the authors.
<!-- XIAllowEvents -->
<enum name="EventMode">
- <item name="AsyncDevice" />
- <item name="SyncDevice" />
- <item name="ReplayDevice" />
- <item name="AsyncPairedDevice" />
- <item name="AsyncPair" />
- <item name="SyncPair" />
- <item name="AcceptTouch" />
- <item name="RejectTouch" />
+ <item name="AsyncDevice"> <value>0</value> </item>
+ <item name="SyncDevice"> <value>1</value> </item>
+ <item name="ReplayDevice"> <value>2</value> </item>
+ <item name="AsyncPairedDevice"> <value>3</value> </item>
+ <item name="AsyncPair"> <value>4</value> </item>
+ <item name="SyncPair"> <value>5</value> </item>
+ <item name="AcceptTouch"> <value>6</value> </item>
+ <item name="RejectTouch"> <value>7</value> </item>
</enum>
<request name="XIAllowEvents" opcode="53">
@@ -1520,17 +1520,17 @@ authorization from the authors.
<!-- XIPassiveGrabDevice -->
<enum name="GrabMode22">
- <item name="Sync" />
- <item name="Async" />
- <item name="Touch" />
+ <item name="Sync"> <value>0</value> </item>
+ <item name="Async"> <value>1</value> </item>
+ <item name="Touch"> <value>2</value> </item>
</enum>
<enum name="GrabType">
- <item name="Button" />
- <item name="Keycode" />
- <item name="Enter" />
- <item name="FocusIn" />
- <item name="TouchBegin" />
+ <item name="Button"> <value>0</value> </item>
+ <item name="Keycode"> <value>1</value> </item>
+ <item name="Enter"> <value>2</value> </item>
+ <item name="FocusIn"> <value>3</value> </item>
+ <item name="TouchBegin"> <value>4</value> </item>
</enum>
<enum name="ModifierMask">
@@ -1822,12 +1822,12 @@ authorization from the authors.
<!-- ⋅⋅⋅ Events (v1.4) ⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅⋅ -->
<enum name="DeviceChange">
- <item name="Added" />
- <item name="Removed" />
- <item name="Enabled" />
- <item name="Disabled" />
- <item name="Unrecoverable" />
- <item name="ControlChanged" />
+ <item name="Added"> <value>0</value> </item>
+ <item name="Removed"> <value>1</value> </item>
+ <item name="Enabled"> <value>2</value> </item>
+ <item name="Disabled"> <value>3</value> </item>
+ <item name="Unrecoverable"> <value>4</value> </item>
+ <item name="ControlChanged"> <value>5</value> </item>
</enum>
<event name="DevicePresenceNotify" number="15">
@@ -1947,23 +1947,23 @@ authorization from the authors.
<eventcopy name="Motion" number="6" ref="ButtonPress" />
<enum name="NotifyMode">
- <item name="Normal" />
- <item name="Grab" />
- <item name="Ungrab" />
- <item name="WhileGrabbed" />
- <item name="PassiveGrab" />
- <item name="PassiveUngrab" />
+ <item name="Normal"> <value>0</value> </item>
+ <item name="Grab"> <value>1</value> </item>
+ <item name="Ungrab"> <value>2</value> </item>
+ <item name="WhileGrabbed"> <value>3</value> </item>
+ <item name="PassiveGrab"> <value>4</value> </item>
+ <item name="PassiveUngrab"> <value>5</value> </item>
</enum>
<enum name="NotifyDetail">
- <item name="Ancestor" />
- <item name="Virtual" />
- <item name="Inferior" />
- <item name="Nonlinear" />
- <item name="NonlinearVirtual" />
- <item name="Pointer" />
- <item name="PointerRoot" />
- <item name="None" />
+ <item name="Ancestor"> <value>0</value> </item>
+ <item name="Virtual"> <value>1</value> </item>
+ <item name="Inferior"> <value>2</value> </item>
+ <item name="Nonlinear"> <value>3</value> </item>
+ <item name="NonlinearVirtual"> <value>4</value> </item>
+ <item name="Pointer"> <value>5</value> </item>
+ <item name="PointerRoot"> <value>6</value> </item>
+ <item name="None"> <value>7</value> </item>
</enum>
<event name="Enter" number="7" xge="true">
@@ -2029,9 +2029,9 @@ authorization from the authors.
</event>
<enum name="PropertyFlag">
- <item name="Deleted" />
- <item name="Created" />
- <item name="Modified" />
+ <item name="Deleted"> <value>0</value> </item>
+ <item name="Created"> <value>1</value> </item>
+ <item name="Modified"> <value>2</value> </item>
</enum>
<event name="Property" number="12" xge="true">
@@ -2131,7 +2131,7 @@ authorization from the authors.
<enum name="TouchOwnershipFlags">
<!-- XXX: Remove this enum? Currently, no flag is defined. -->
- <item name="None" />
+ <item name="None"> <value>0</value> </item>
</enum>
<event name="TouchOwnership" number="21" xge="true">
diff --git a/libxcb/xcb-proto/src/xkb.xml b/libxcb/xcb-proto/src/xkb.xml
index b702cad43..45f64127e 100644
--- a/libxcb/xcb-proto/src/xkb.xml
+++ b/libxcb/xcb-proto/src/xkb.xml
@@ -648,6 +648,7 @@ authorization from the authors.
<field name="top" type="INT16" />
<field name="left" type="INT16" />
<field name="angle" type="INT16" />
+ <pad bytes="8" />
</struct>
<struct name="ShapeDoodad">
@@ -1002,6 +1003,7 @@ authorization from the authors.
<pad bytes="1" />
<field name="button" type="CARD8" />
<field name="device" type="CARD8" />
+ <pad bytes="3" />
</struct>
<enum name="SAValWhat">
@@ -2610,7 +2612,7 @@ authorization from the authors.
<pad bytes="1" />
<field name="reason" type="CARD16" mask="XIFeature" />
<field name="ledClass" type="CARD16" enum="LedClassResult" />
- <field name="ledID" type="CARD8" />
+ <field name="ledID" type="CARD16" />
<field name="ledsDefined" type="CARD32" />
<field name="ledState" type="CARD32" />
<field name="firstButton" type="CARD8" />
diff --git a/libxcb/xcb-proto/src/xproto.xml b/libxcb/xcb-proto/src/xproto.xml
index c97919bef..16e04b442 100644
--- a/libxcb/xcb-proto/src/xproto.xml
+++ b/libxcb/xcb-proto/src/xproto.xml
@@ -889,74 +889,74 @@ A timestamp of the server time when the property was changed.
<enum name="Atom">
<item name="None"> <value>0</value></item>
<item name="Any"> <value>0</value></item>
- <item name="PRIMARY" />
- <item name="SECONDARY" />
- <item name="ARC" />
- <item name="ATOM" />
- <item name="BITMAP" />
- <item name="CARDINAL" />
- <item name="COLORMAP" />
- <item name="CURSOR" />
- <item name="CUT_BUFFER0" />
- <item name="CUT_BUFFER1" />
- <item name="CUT_BUFFER2" />
- <item name="CUT_BUFFER3" />
- <item name="CUT_BUFFER4" />
- <item name="CUT_BUFFER5" />
- <item name="CUT_BUFFER6" />
- <item name="CUT_BUFFER7" />
- <item name="DRAWABLE" />
- <item name="FONT" />
- <item name="INTEGER" />
- <item name="PIXMAP" />
- <item name="POINT" />
- <item name="RECTANGLE" />
- <item name="RESOURCE_MANAGER" />
- <item name="RGB_COLOR_MAP" />
- <item name="RGB_BEST_MAP" />
- <item name="RGB_BLUE_MAP" />
- <item name="RGB_DEFAULT_MAP" />
- <item name="RGB_GRAY_MAP" />
- <item name="RGB_GREEN_MAP" />
- <item name="RGB_RED_MAP" />
- <item name="STRING" />
- <item name="VISUALID" />
- <item name="WINDOW" />
- <item name="WM_COMMAND" />
- <item name="WM_HINTS" />
- <item name="WM_CLIENT_MACHINE" />
- <item name="WM_ICON_NAME" />
- <item name="WM_ICON_SIZE" />
- <item name="WM_NAME" />
- <item name="WM_NORMAL_HINTS" />
- <item name="WM_SIZE_HINTS" />
- <item name="WM_ZOOM_HINTS" />
- <item name="MIN_SPACE" />
- <item name="NORM_SPACE" />
- <item name="MAX_SPACE" />
- <item name="END_SPACE" />
- <item name="SUPERSCRIPT_X" />
- <item name="SUPERSCRIPT_Y" />
- <item name="SUBSCRIPT_X" />
- <item name="SUBSCRIPT_Y" />
- <item name="UNDERLINE_POSITION" />
- <item name="UNDERLINE_THICKNESS" />
- <item name="STRIKEOUT_ASCENT" />
- <item name="STRIKEOUT_DESCENT" />
- <item name="ITALIC_ANGLE" />
- <item name="X_HEIGHT" />
- <item name="QUAD_WIDTH" />
- <item name="WEIGHT" />
- <item name="POINT_SIZE" />
- <item name="RESOLUTION" />
- <item name="COPYRIGHT" />
- <item name="NOTICE" />
- <item name="FONT_NAME" />
- <item name="FAMILY_NAME" />
- <item name="FULL_NAME" />
- <item name="CAP_HEIGHT" />
- <item name="WM_CLASS" />
- <item name="WM_TRANSIENT_FOR" />
+ <item name="PRIMARY"> <value>1</value> </item>
+ <item name="SECONDARY"> <value>2</value> </item>
+ <item name="ARC"> <value>3</value> </item>
+ <item name="ATOM"> <value>4</value> </item>
+ <item name="BITMAP"> <value>5</value> </item>
+ <item name="CARDINAL"> <value>6</value> </item>
+ <item name="COLORMAP"> <value>7</value> </item>
+ <item name="CURSOR"> <value>8</value> </item>
+ <item name="CUT_BUFFER0"> <value>9</value> </item>
+ <item name="CUT_BUFFER1"> <value>10</value> </item>
+ <item name="CUT_BUFFER2"> <value>11</value> </item>
+ <item name="CUT_BUFFER3"> <value>12</value> </item>
+ <item name="CUT_BUFFER4"> <value>13</value> </item>
+ <item name="CUT_BUFFER5"> <value>14</value> </item>
+ <item name="CUT_BUFFER6"> <value>15</value> </item>
+ <item name="CUT_BUFFER7"> <value>16</value> </item>
+ <item name="DRAWABLE"> <value>17</value> </item>
+ <item name="FONT"> <value>18</value> </item>
+ <item name="INTEGER"> <value>19</value> </item>
+ <item name="PIXMAP"> <value>20</value> </item>
+ <item name="POINT"> <value>21</value> </item>
+ <item name="RECTANGLE"> <value>22</value> </item>
+ <item name="RESOURCE_MANAGER"> <value>23</value> </item>
+ <item name="RGB_COLOR_MAP"> <value>24</value> </item>
+ <item name="RGB_BEST_MAP"> <value>25</value> </item>
+ <item name="RGB_BLUE_MAP"> <value>26</value> </item>
+ <item name="RGB_DEFAULT_MAP"> <value>27</value> </item>
+ <item name="RGB_GRAY_MAP"> <value>28</value> </item>
+ <item name="RGB_GREEN_MAP"> <value>29</value> </item>
+ <item name="RGB_RED_MAP"> <value>30</value> </item>
+ <item name="STRING"> <value>31</value> </item>
+ <item name="VISUALID"> <value>32</value> </item>
+ <item name="WINDOW"> <value>33</value> </item>
+ <item name="WM_COMMAND"> <value>34</value> </item>
+ <item name="WM_HINTS"> <value>35</value> </item>
+ <item name="WM_CLIENT_MACHINE"> <value>36</value> </item>
+ <item name="WM_ICON_NAME"> <value>37</value> </item>
+ <item name="WM_ICON_SIZE"> <value>38</value> </item>
+ <item name="WM_NAME"> <value>39</value> </item>
+ <item name="WM_NORMAL_HINTS"> <value>40</value> </item>
+ <item name="WM_SIZE_HINTS"> <value>41</value> </item>
+ <item name="WM_ZOOM_HINTS"> <value>42</value> </item>
+ <item name="MIN_SPACE"> <value>43</value> </item>
+ <item name="NORM_SPACE"> <value>44</value> </item>
+ <item name="MAX_SPACE"> <value>45</value> </item>
+ <item name="END_SPACE"> <value>46</value> </item>
+ <item name="SUPERSCRIPT_X"> <value>47</value> </item>
+ <item name="SUPERSCRIPT_Y"> <value>48</value> </item>
+ <item name="SUBSCRIPT_X"> <value>49</value> </item>
+ <item name="SUBSCRIPT_Y"> <value>50</value> </item>
+ <item name="UNDERLINE_POSITION"> <value>51</value> </item>
+ <item name="UNDERLINE_THICKNESS"> <value>52</value> </item>
+ <item name="STRIKEOUT_ASCENT"> <value>53</value> </item>
+ <item name="STRIKEOUT_DESCENT"> <value>54</value> </item>
+ <item name="ITALIC_ANGLE"> <value>55</value> </item>
+ <item name="X_HEIGHT"> <value>56</value> </item>
+ <item name="QUAD_WIDTH"> <value>57</value> </item>
+ <item name="WEIGHT"> <value>58</value> </item>
+ <item name="POINT_SIZE"> <value>59</value> </item>
+ <item name="RESOLUTION"> <value>60</value> </item>
+ <item name="COPYRIGHT"> <value>61</value> </item>
+ <item name="NOTICE"> <value>62</value> </item>
+ <item name="FONT_NAME"> <value>63</value> </item>
+ <item name="FAMILY_NAME"> <value>64</value> </item>
+ <item name="FULL_NAME"> <value>65</value> </item>
+ <item name="CAP_HEIGHT"> <value>66</value> </item>
+ <item name="WM_CLASS"> <value>67</value> </item>
+ <item name="WM_TRANSIENT_FOR"> <value>68</value> </item>
</enum>
<event name="SelectionRequest" number="30">
diff --git a/libxcb/xcb-proto/src/xv.xml b/libxcb/xcb-proto/src/xv.xml
index d2bfc2992..a05767c53 100644
--- a/libxcb/xcb-proto/src/xv.xml
+++ b/libxcb/xcb-proto/src/xv.xml
@@ -44,13 +44,13 @@ authorization from the authors.
</enum>
<enum name="ImageFormatInfoType">
- <item name="RGB" />
- <item name="YUV" />
+ <item name="RGB"> <value>0</value> </item>
+ <item name="YUV"> <value>1</value> </item>
</enum>
<enum name="ImageFormatInfoFormat">
- <item name="Packed" />
- <item name="Planar" />
+ <item name="Packed"> <value>0</value> </item>
+ <item name="Planar"> <value>1</value> </item>
</enum>
<enum name="AttributeFlag">
@@ -59,25 +59,25 @@ authorization from the authors.
</enum>
<enum name="VideoNotifyReason">
- <item name="Started" />
- <item name="Stopped" />
- <item name="Busy" />
- <item name="Preempted" />
- <item name="HardError" />
+ <item name="Started"> <value>0</value> </item>
+ <item name="Stopped"> <value>1</value> </item>
+ <item name="Busy"> <value>2</value> </item>
+ <item name="Preempted"> <value>3</value> </item>
+ <item name="HardError"> <value>4</value> </item>
</enum>
<enum name="ScanlineOrder">
- <item name="TopToBottom" />
- <item name="BottomToTop" />
+ <item name="TopToBottom"> <value>0</value> </item>
+ <item name="BottomToTop"> <value>1</value> </item>
</enum>
<enum name="GrabPortStatus">
- <item name="Success" />
- <item name="BadExtension" />
- <item name="AlreadyGrabbed" />
- <item name="InvalidTime" />
- <item name="BadReply" />
- <item name="BadAlloc" />
+ <item name="Success"> <value>0</value> </item>
+ <item name="BadExtension"> <value>1</value> </item>
+ <item name="AlreadyGrabbed"> <value>2</value> </item>
+ <item name="InvalidTime"> <value>3</value> </item>
+ <item name="BadReply"> <value>4</value> </item>
+ <item name="BadAlloc"> <value>5</value> </item>
</enum>
<struct name="Rational">