From: Christian Linhart <chris@DemoRecorder.com>
Date: Tue, 19 Aug 2014 11:13:24 +0000 (+0200)
Subject: xinput: ev DeviceKeyPress.device_id: add mask
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07e5a4a2f09a538567ee3ea8ca7444d432e6ac14;p=free-sw%2Fxcb%2Fproto

xinput: ev DeviceKeyPress.device_id: add mask

for event DeviceKeyPress and derived ones:
add new mask "MoreEventsMask" to field "device_id"

V2: patch revised according to suggestion from Peter Harris:
* use "altmask" instead of "mask"
  because all the legal values of device_id are not described
  by the <bit> elements of MoreEventsMask.

spec and code:
http://cgit.freedesktop.org/xorg/lib/libXi/tree/specs/encoding.xml#n1999
http://cgit.freedesktop.org/xorg/lib/libXi/tree/src/XExtInt.c#n534
http://cgit.freedesktop.org/xorg/xserver/tree/dix/eventconvert.c#n348
http://cgit.freedesktop.org/xorg/xserver/tree/Xi/exevents.c#n188

note:
this mask is missing in the following spec:
http://cgit.freedesktop.org/xorg/proto/inputproto/tree/specs/XIproto.txt#n2257
---

diff --git a/src/xinput.xml b/src/xinput.xml
index 179735f..7b7b948 100644
--- a/src/xinput.xml
+++ b/src/xinput.xml
@@ -1847,7 +1847,7 @@ authorization from the authors.
         <field type="INT16"     name="event_y" />
         <field type="CARD16"    name="state" mask="KeyButMask" />
         <field type="BOOL"      name="same_screen" />
-        <field type="CARD8"     name="device_id" />
+        <field type="CARD8"     name="device_id" altmask="MoreEventsMask" />
     </event>
 
     <eventcopy name="DeviceKeyRelease"    number="2" ref="DeviceKeyPress" />