Attachment 83738 Details for Bug 51295 – xkb: Rename enum EventType to EventTypeMask, add EventType

[patch] xkb: Rename enum EventType to EventTypeMask, add EventType

0001-xkb-Rename-enum-EventType-to-EventTypeMask-add-Event.patch (text/plain), 5.06 KB, created by Daniel Martin on 2013-08-06 20:37:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Martin

Created: 2013-08-06 20:37:26 UTC

Size: 5.06 KB

patch

obsolete

>From 688316ac5b26764109f52c08016060ca55b90292 Mon Sep 17 00:00:00 2001
>From: Daniel Martin <consume.noise@gmail.com>
>Date: Tue, 6 Aug 2013 21:56:10 +0200
>Subject: [proto] xkb: Rename enum EventType to EventTypeMask, add EventType
>
>The enum EventType had the bit mask items for the SelectEvents request
>and therefor should've been called EventTypeMask. Renaming it to
>EventTypeMask makes it possible to add an enum EventType, which can be
>used to distinguish the sub events later.
>
>Signed-off-by: Daniel Martin <consume.noise@gmail.com>
>---
> src/xkb.xml | 43 +++++++++++++++++++++++++++++--------------
> 1 file changed, 29 insertions(+), 14 deletions(-)
>
>diff --git a/src/xkb.xml b/src/xkb.xml
>index 0e263c4..eab0cc4 100644
>--- a/src/xkb.xml
>+++ b/src/xkb.xml
>@@ -41,6 +41,21 @@ <enum name="Const">
> 	</enum>
> 
> 	<enum name="EventType">
>+		<item name="NewKeyboardNotify" />
>+		<item name="MapNotify" />
>+		<item name="StateNotify" />
>+		<item name="ControlsNotify" />
>+		<item name="IndicatorStateNotify" />
>+		<item name="IndicatorMapNotify" />
>+		<item name="NamesNotify" />
>+		<item name="CompatMapNotify" />
>+		<item name="BellNotify" />
>+		<item name="ActionMessage" />
>+		<item name="AccessXNotify" />
>+		<item name="ExtensionDeviceNotify" />
>+	</enum>
>+
>+	<enum name="EventTypeMask">
> 		<item name="NewKeyboardNotify">      <bit>0</bit> </item>
> 		<item name="MapNotify">              <bit>1</bit> </item>
> 		<item name="StateNotify">            <bit>2</bit> </item>
>@@ -1086,9 +1101,9 @@ <request name="UseExtension" opcode="0">
> 
> 	<request name="SelectEvents" opcode="1">
> 		<field name="deviceSpec" type="DeviceSpec" />
>-		<field name="affectWhich" type="CARD16" mask="EventType" />
>-		<field name="clear" type="CARD16" mask="EventType" />
>-		<field name="selectAll" type="CARD16" mask="EventType" />
>+		<field name="affectWhich" type="CARD16" mask="EventTypeMask" />
>+		<field name="clear" type="CARD16" mask="EventTypeMask" />
>+		<field name="selectAll" type="CARD16" mask="EventTypeMask" />
> 		<field name="affectMap" type="CARD16" mask="MapPart" />
> 		<field name="map" type="CARD16" mask="MapPart" />
> 		<switch name="details">
>@@ -1100,57 +1115,57 @@ <request name="SelectEvents" opcode="1">
> 				</op>
> 			</op>
> 			<bitcase>
>-				<enumref ref="EventType">NewKeyboardNotify</enumref>
>+				<enumref ref="EventTypeMask">NewKeyboardNotify</enumref>
> 				<field name="affectNewKeyboard" type="CARD16" mask="NKNDetail" />
> 				<field name="newKeyboardDetails" type="CARD16" mask="NKNDetail" />
> 			</bitcase>
> 			<bitcase>
>-				<enumref ref="EventType">StateNotify</enumref>
>+				<enumref ref="EventTypeMask">StateNotify</enumref>
> 				<field name="affectState" type="CARD16" mask="StatePart" />
> 				<field name="stateDetails" type="CARD16" mask="StatePart" />
> 			</bitcase>
> 			<bitcase>
>-				<enumref ref="EventType">ControlsNotify</enumref>
>+				<enumref ref="EventTypeMask">ControlsNotify</enumref>
> 				<field name="affectCtrls" type="CARD32" mask="Control" />
> 				<field name="ctrlDetails" type="CARD32" mask="Control" />
> 			</bitcase>
> 			<bitcase>
>-				<enumref ref="EventType">IndicatorStateNotify</enumref>
>+				<enumref ref="EventTypeMask">IndicatorStateNotify</enumref>
> 				<field name="affectIndicatorState" type="CARD32" />
> 				<field name="indicatorStateDetails" type="CARD32" />
> 			</bitcase>
> 			<bitcase>
>-				<enumref ref="EventType">IndicatorMapNotify</enumref>
>+				<enumref ref="EventTypeMask">IndicatorMapNotify</enumref>
> 				<field name="affectIndicatorMap" type="CARD32" />
> 				<field name="indicatorMapDetails" type="CARD32" />
> 			</bitcase>
> 			<bitcase>
>-				<enumref ref="EventType">NamesNotify</enumref>
>+				<enumref ref="EventTypeMask">NamesNotify</enumref>
> 				<field name="affectNames" type="CARD16" mask="NameDetail" />
> 				<field name="namesDetails" type="CARD16" mask="NameDetail" />
> 			</bitcase>
> 			<bitcase>
>-				<enumref ref="EventType">CompatMapNotify</enumref>
>+				<enumref ref="EventTypeMask">CompatMapNotify</enumref>
> 				<field name="affectCompat" type="CARD8" mask="CMDetail" />
> 				<field name="compatDetails" type="CARD8" mask="CMDetail" />
> 			</bitcase>
> 			<bitcase>
>-				<enumref ref="EventType">BellNotify</enumref>
>+				<enumref ref="EventTypeMask">BellNotify</enumref>
> 				<field name="affectBell" type="CARD8" />
> 				<field name="bellDetails" type="CARD8" />
> 			</bitcase>
> 			<bitcase>
>-				<enumref ref="EventType">ActionMessage</enumref>
>+				<enumref ref="EventTypeMask">ActionMessage</enumref>
> 				<field name="affectMsgDetails" type="CARD8" />
> 				<field name="msgDetails" type="CARD8" />
> 			</bitcase>
> 			<bitcase>
>-				<enumref ref="EventType">AccessXNotify</enumref>
>+				<enumref ref="EventTypeMask">AccessXNotify</enumref>
> 				<field name="affectAccessX" type="CARD16" mask="AXNDetail" />
> 				<field name="accessXDetails" type="CARD16" mask="AXNDetail" />
> 			</bitcase>
> 			<bitcase>
>-				<enumref ref="EventType">ExtensionDeviceNotify</enumref>
>+				<enumref ref="EventTypeMask">ExtensionDeviceNotify</enumref>
> 				<field name="affectExtDev" type="CARD16" mask="XIFeature" />
> 				<field name="extdevDetails" type="CARD16" mask="XIFeature" />
> 			</bitcase>
>-- 
>1.8.3.3
>

Actions: View | Splinter Review

Attachments on bug 51295: 83738

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.