From: Daniel Martin <consume.noise@gmail.com>
Date: Tue, 15 Jan 2013 11:51:30 +0000 (+0100)
Subject: xkb: Revert half of d42d791 XKB: Fix broken events
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7265cbb3a9b546a84cfbbb9a172a19e5d92b6e52;p=free-sw%2Fxcb%2Fproto

xkb: Revert half of d42d791 XKB: Fix broken events

The no-sequence-number attribute was not necessary to achive what commit
d42d791 did. The first field automatically goes between the
response_type and the sequence field in the header. So, adding the
xkbType field would've been sufficient to fix the broken events.

Reference-to: d42d791 XKB: Fix broken events
---

diff --git a/src/xkb.xml b/src/xkb.xml
index a6ef374..c260720 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -2593,9 +2593,8 @@ authorization from the authors.
 
 	<!-- Events -->
 
-	<event name="NewKeyboardNotify" number="0" no-sequence-number="true">
+	<event name="NewKeyboardNotify" number="0">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<field name="oldDeviceID" type="CARD8" />
@@ -2609,9 +2608,8 @@ authorization from the authors.
 		<pad bytes="14" />
 	</event>
 
-	<event name="MapNotify" number="1" no-sequence-number="true">
+	<event name="MapNotify" number="1">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<field name="ptrBtnActions" type="CARD8" />
@@ -2636,9 +2634,8 @@ authorization from the authors.
 		<pad bytes="2" />
 	</event>
 
-	<event name="StateNotify" number="2" no-sequence-number="true">
+	<event name="StateNotify" number="2">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<field name="mods" type="CARD8" mask="ModMask" />
@@ -2662,9 +2659,8 @@ authorization from the authors.
 		<field name="requestMinor" type="CARD8" />
 	</event>
 
-	<event name="ControlsNotify" number="3" no-sequence-number="true">
+	<event name="ControlsNotify" number="3">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<field name="numGroups" type="CARD8" />
@@ -2679,9 +2675,8 @@ authorization from the authors.
 		<pad bytes="4" />
 	</event>
 
-	<event name="IndicatorStateNotify" number="4" no-sequence-number="true">
+	<event name="IndicatorStateNotify" number="4">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<pad bytes="3" />
@@ -2690,9 +2685,8 @@ authorization from the authors.
 		<pad bytes="12" />
 	</event>
 
-	<event name="IndicatorMapNotify" number="5" no-sequence-number="true">
+	<event name="IndicatorMapNotify" number="5">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<pad bytes="3" />
@@ -2701,9 +2695,8 @@ authorization from the authors.
 		<pad bytes="12" />
 	</event>
 
-	<event name="NamesNotify" number="6" no-sequence-number="true">
+	<event name="NamesNotify" number="6">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<pad bytes="1" />
@@ -2723,9 +2716,8 @@ authorization from the authors.
 		<pad bytes="4" />
 	</event>
 
-	<event name="CompatMapNotify" number="7" no-sequence-number="true">
+	<event name="CompatMapNotify" number="7">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<field name="changedGroups" type="CARD8" mask="SetOfGroup" />
@@ -2735,9 +2727,8 @@ authorization from the authors.
 		<pad bytes="16" />
 	</event>
 
-	<event name="BellNotify" number="8" no-sequence-number="true">
+	<event name="BellNotify" number="8">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<field name="bellClass" type="CARD8" enum="BellClassResult" />
@@ -2751,9 +2742,8 @@ authorization from the authors.
 		<pad bytes="7" />
 	</event>
 
-	<event name="ActionMessage" number="9" no-sequence-number="true">
+	<event name="ActionMessage" number="9">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<field name="keycode" type="KEYCODE" />
@@ -2767,9 +2757,8 @@ authorization from the authors.
 		<pad bytes="10" />
 	</event>
 
-	<event name="AccessXNotify" number="10" no-sequence-number="true">
+	<event name="AccessXNotify" number="10">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<field name="keycode" type="KEYCODE" />
@@ -2779,9 +2768,8 @@ authorization from the authors.
 		<pad bytes="16" />
 	</event>
 
-	<event name="ExtensionDeviceNotify" number="11" no-sequence-number="true">
+	<event name="ExtensionDeviceNotify" number="11">
 		<field name="xkbType" type="CARD8" />
-		<field name="sequence" type="CARD16" />
 		<field name="time" type="TIMESTAMP" />
 		<field name="deviceID" type="CARD8" />
 		<pad bytes="1" />