[Xcb] [PATCH proto 06/22] xinput: req UngrabDeviceKey.modifier_device: altenum

Christian Linhart chris at demorecorder.com
Mon Aug 18 05:59:46 PDT 2014


add altenum ModifierDevice to field modifier_device for value UseXKeyboard

spec and code:
http://cgit.freedesktop.org/xorg/lib/libXi/tree/specs/encoding.xml#n1175
http://cgit.freedesktop.org/xorg/proto/inputproto/tree/XI.h#n187
http://cgit.freedesktop.org/xorg/xserver/tree/Xi/ungrdevk.c#n113

the following spec uses "NULL" instead of "UseXKeyboard":
http://cgit.freedesktop.org/xorg/proto/inputproto/tree/specs/XIproto.txt#n1295
Questions:
* is this spec wrong?
* or does "NULL" have the unusual value of 0xff in this context?
---
 src/xinput.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xinput.xml b/src/xinput.xml
index 91fcecf..1ac8278 100644
--- a/src/xinput.xml
+++ b/src/xinput.xml
@@ -381,15 +381,15 @@ <request name="GrabDeviceKey" opcode="15">
     </request>
 
     <!-- UngrabDeviceKey -->
 
     <request name="UngrabDeviceKey" opcode="16">
         <field type="WINDOW" name="grabWindow" />
         <field type="CARD16" name="modifiers" mask="ModMask" />
-        <field type="CARD8"  name="modifier_device" />
+        <field type="CARD8"  name="modifier_device" altenum="ModifierDevice" />
         <field type="CARD8"  name="key" altenum="Grab" />
         <field type="CARD8"  name="grabbed_device" />
     </request>
 
     <!-- GrabDeviceButton -->
 
     <request name="GrabDeviceButton" opcode="17">
-- 
2.0.1



More information about the Xcb mailing list