[Xcb] [PATCH] xkb: Fix use of nKTLevels

Peter Harris pharris at opentext.com
Mon Apr 28 14:05:10 PDT 2014


nLevelsPerType is nLevels long, and ktLevelNames is nKTLevels long.
This continues the work started in
76ca2c0b1527541be59c344118c538ba055ad9d8.

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

This removes the only usages of <sumof>. I debated removing it (or at
least marking it deprecated in a comment) in the xsd, but a comment in
xinput implies that it could be useful there in the future.

 src/xkb.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/xkb.xml b/src/xkb.xml
index 9ef4402..dbd219b 100644
--- a/src/xkb.xml
+++ b/src/xkb.xml
@@ -1678,7 +1678,7 @@ authorization from the authors.
 					    </op>
 					</list>
 					<list name="ktLevelNames" type="ATOM">
-						<sumof ref="nLevelsPerType" />
+						<fieldref>nKTLevels</fieldref>
 					</list>
 				</bitcase>
 				<bitcase>
@@ -1778,10 +1778,10 @@ authorization from the authors.
 			<bitcase>
 				<enumref ref="NameDetail">KTLevelNames</enumref>
 				<list name="nLevelsPerType" type="CARD8">
-					<fieldref>nKTLevels</fieldref>
+					<fieldref>nTypes</fieldref>
 				</list>
 				<list name="ktLevelNames" type="ATOM">
-					<sumof ref="nLevelsPerType" />
+					<fieldref>nKTLevels</fieldref>
 				</list>
 			</bitcase>
 			<bitcase>
@@ -2220,10 +2220,10 @@ authorization from the authors.
 						<bitcase>
 							<enumref ref="NameDetail">KTLevelNames</enumref>
 							<list name="nLevelsPerType" type="CARD8">
-								<fieldref>nKTLevels</fieldref>
+								<fieldref>nTypes</fieldref>
 							</list>
 							<list name="ktLevelNames" type="ATOM">
-								<sumof ref="nLevelsPerType" />
+								<fieldref>nKTLevels</fieldref>
 							</list>
 						</bitcase>
 						<bitcase>
-- 
1.9.2



More information about the Xcb mailing list