From: Peter Harris <pharris@opentext.com>
Date: Fri, 6 Dec 2013 21:17:37 +0000 (-0500)
Subject: xinput: Explicitly specify NotifyMode and NotifyDetail
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b96ddddecd858898c468e2e20f61020f608e3c05;p=free-sw%2Fxcb%2Fproto

xinput: Explicitly specify NotifyMode and NotifyDetail

There is a NotifyMode and a NotifyDetail in both xproto and xinput.  Add
a namespece to the enum references to be clear about which one is to be
used.

Signed-off-by: Peter Harris <pharris@opentext.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/src/xinput.xml b/src/xinput.xml
index dd3f184..fa115bd 100644
--- a/src/xinput.xml
+++ b/src/xinput.xml
@@ -1790,10 +1790,10 @@ authorization from the authors.
     <eventcopy name="DeviceMotionNotify"  number="5" ref="DeviceKeyPress" />
 
     <event name="DeviceFocusIn" number="6">
-        <field type="BYTE"      name="detail" enum="NotifyDetail" />
+        <field type="BYTE"      name="detail" enum="xproto:NotifyDetail" />
         <field type="TIMESTAMP" name="time" />
         <field type="WINDOW"    name="window" />
-        <field type="BYTE"      name="mode" enum="NotifyMode" />
+        <field type="BYTE"      name="mode" enum="xproto:NotifyMode" />
         <field type="CARD8"     name="device_id" />
         <pad bytes="18" />
     </event>
@@ -2003,8 +2003,8 @@ authorization from the authors.
         <field type="TIMESTAMP" name="time" altenum="Time" />
         <!-- event specific fields -->
         <field type="DeviceId"  name="sourceid" altenum="Device" />
-        <field type="CARD8"     name="mode" enum="NotifyMode" />
-        <field type="CARD8"     name="detail" enum="NotifyDetail" />
+        <field type="CARD8"     name="mode" enum="xinput:NotifyMode" />
+        <field type="CARD8"     name="detail" enum="xinput:NotifyDetail" />
         <field type="WINDOW"    name="root" />
         <field type="WINDOW"    name="event" />
         <field type="WINDOW"    name="child" />