From: Ran Benita <ran234@gmail.com>
Date: Sun, 4 Aug 2013 10:33:30 +0000 (+0300)
Subject: xkb: Fix key type map entry field order
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4321385e01a5a7e9bf5dfa697b54b103dc05a81;p=free-sw%2Fxcb%2Fproto

xkb: Fix key type map entry field order

In fact, unlike the deleted comment says, both Xlib and the server use
the order as specified in the protocol spec:
http://www.x.org/releases/current/doc/kbproto/xkbproto.html#appD::Requests
(Search for KB_KTMAPENTRY).

Also see struct xkbKTMapEntryWireDesc in
/usr/include/X11/extensions/XKBproto.h

Reviewed-by: Peter Harris <pharris@opentext.com>
Reviewed-by: Daniel Martin <consume.noise@gmail.com>
Signed-off-by: Ran Benita <ran234@gmail.com>
---

diff --git a/src/xkb.xml b/src/xkb.xml
index 15b3368..6de634e 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -410,12 +410,8 @@ authorization from the authors.
 
 	<struct name="KTMapEntry">
 		<field name="active" type="BOOL" />
-		<!-- Xlib uses a different arrangement of fields
 		<field name="mods_mask" type="CARD8" mask="ModMask" />
 		<field name="level" type="CARD8" />
-		-->
-		<field name="level" type="CARD8" />
-		<field name="mods_mask" type="CARD8" mask="ModMask" />
 		<field name="mods_mods" type="CARD8" mask="ModMask" />
 		<field name="mods_vmods" type="CARD16" mask="VMod" />
 		<pad bytes="2" />