From: Peter Harris <pharris@opentext.com>
Date: Wed, 10 Apr 2013 23:05:23 +0000 (-0400)
Subject: XKB: Fix VirtualMods
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ad6d97b39b90c54002c8c0fbb2612c898137386;hp=b6abdad2c2b0a332a40490d8f63a581100bc1293;p=free-sw%2Fxcb%2Fproto

XKB: Fix VirtualMods

nVModMapKeys is usually larger than <popcount>virtualMods</popcount>.

Signed-off-by: Peter Harris <pharris@opentext.com>
---

diff --git a/src/xkb.xml b/src/xkb.xml
index 41dbe54..f62c55e 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -1363,7 +1363,7 @@ authorization from the authors.
 				<bitcase>
 					<enumref ref="MapPart">VirtualMods</enumref>
 					<list name="vmods_rtrn" type="CARD8" mask="ModMask">
-						<fieldref>nVModMapKeys</fieldref>
+						<popcount><fieldref>virtualMods</fieldref></popcount>
 					</list>
 				</bitcase>
 				<bitcase>
@@ -1447,7 +1447,7 @@ authorization from the authors.
 			<bitcase>
 				<enumref ref="MapPart">VirtualMods</enumref>
 				<list name="vmods" type="CARD8">
-					<fieldref>nVModMapKeys</fieldref>
+					<popcount><fieldref>virtualMods</fieldref></popcount>
 				</list>
 			</bitcase>
 			<bitcase>
@@ -2071,7 +2071,7 @@ authorization from the authors.
 						<bitcase>
 							<enumref ref="MapPart">VirtualMods</enumref>
 							<list name="vmods_rtrn" type="CARD8" mask="ModMask">
-								<fieldref>nVModMapKeys</fieldref>
+								<popcount><fieldref>virtualMods</fieldref></popcount>
 							</list>
 						</bitcase>
 						<bitcase>