Hi, On 10/27/2014 05:37 AM, Peter Hutterer wrote: > EVENTMASK was used twice in the spec, once as the actual bitmask for events, > once as the set of deviceid, mask length and mask. > > The libXi public API uses XIEventMask for the latter data triplet, so leave > EVENTMASK, and rename the pure bitmask to EVTYPEMASK. > > Reported-by: Gabriel Laskar <gabr...@lse.epita.fr> > Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Looks good: Reviewed-by: Hans de Goede <hdego...@redhat.com> Regards, Hans > --- > specs/XI2proto.txt | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt > index e3636ac..697dd89 100644 > --- a/specs/XI2proto.txt > +++ b/specs/XI2proto.txt > @@ -672,9 +672,9 @@ Data types > device hierarchy. See Section "The Master/Slave device hierarchy" > for more information. > > - EVENTMASK > - An EVENTMASK is a binary mask defined as (1 << event type). > - A SETofEVENTMASK is a binary OR of zero or more EVENTMASK. > + EVTYPEMASK > + An EVTYPEMASK is a binary mask defined as (1 << event type). > + A SETofEVTYPEMASK is a binary OR of zero or more EVTYPEMASK. > > FP1616 > Fixed point decimal in 16.16 format as one INT16 and one CARD16. > @@ -971,7 +971,7 @@ XISelectEvents > > EVENTMASK { deviceid: DEVICE, > mask_len: CARD16, > - mask: SETofEVENTMASK > + mask: SETofEVTYPEMASK } > > window > The window to select the events on. > @@ -1392,7 +1392,7 @@ XIGrabDevice > time: TIMESTAMP or CurrentTime > cursor: Cursor > mask_len: CARD16 > - masks: SETofEVENTMASK > + masks: SETofEVTYPEMASK > ▶ > status: Success, AlreadyGrabbed, Frozen, InvalidTime, > NotViewable > └─── > @@ -1638,7 +1638,7 @@ XIPassiveGrabDevice > paired_device_mode: { Synchronous, Asynchronous } > num_modifiers: INT16 > mask_len: CARD16 > - masks: SETofEVENTMASK > + masks: SETofEVTYPEMASK > modifiers: LISTofSETofMODIFIERMASK > ▶ > num_modifiers_return: INT16 > _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel