From 377efaaa9828b4004741744ae172a193b5483a34 Mon Sep 17 00:00:00 2001 From: Daniel Martin Date: Wed, 7 Nov 2012 12:41:49 +0100 Subject: specs: XI2: Fix mods in XIPassive(Un)GrabDevice XIPassiveGrabDevice and XIPassiveUngrabDevice are using lists of modifier masks. This one corrects these types. MODIFIERMASK was introduced, because a SETofMODIFIERMASK differs from a SETofKEYMASK: AnyModifier=(1<<15) vs. GrabAnyModifier=(1U<<31). Signed-off-by: Daniel Martin Signed-off-by: Peter Hutterer --- specs/XI2proto.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'specs') diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt index 3c88891..c018026 100644 --- a/specs/XI2proto.txt +++ b/specs/XI2proto.txt @@ -624,6 +624,11 @@ Data types The INT32 contains the integral part, the CARD32 the decimal fraction shifted by 32. + MODIFIERMASK + A MODIFIERMASK is a binary mask defined as (1 << modifier map index). + A SETofMODIFIERMASK is a binary OR of zero or more MODIFIERMASK or + GrabAnyModifier. + VALUATORMASK A binary mask defined as (1 << valuator number). A SETofVALUATORMASK is a binary OR of zero or more VALUATORMASK. @@ -1571,17 +1576,17 @@ XIPassiveGrabDevice num_modifiers: INT16 mask_len: CARD16 masks: SETofEVENTMASK - modifiers: CARD32 or GrabAnyModifier + modifiers: LISTofSETofMODIFIERMASK ▶ num_modifiers_return: INT16 - modifiers_return: GRABMODIFIERINFO + modifiers_return: LISTofGRABMODIFIERINFO └─── GRABTYPE { GrabtypeButton, GrabtypeKeycode, GrabtypeEnter, GrabtypeFocusIn, GrabtypeTouchBegin¹ } GRABMODIFIERINFO { status: Access - modifiers: CARD32 } + modifiers: SETofMODIFIERMASK } ¹ since XI 2.2 @@ -1755,7 +1760,7 @@ XIPassiveUngrabDevice grab_type: GRABTYPE grab_window: Window num_modifiers: INT16 - modifiers: MODIFIERINFO + modifiers: LISTofSETofMODIFIERMASK └─── Release an explicit passive grab on the specified input device. -- cgit v1.2.1