From fc7f67959ad72c76e852827963d6a42b7d533b89 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 10 Mar 2009 12:26:18 +1000 Subject: XI2: remove button state from the RawEvent. A RawEvent is supposed to represent the state posted by the device. If a client needs button state, then the client must keep track of it. --- XI2proto.h | 3 +-- XI2proto.txt | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/XI2proto.h b/XI2proto.h index e54b145..21a8240 100644 --- a/XI2proto.h +++ b/XI2proto.h @@ -573,10 +573,9 @@ typedef struct uint16_t eventtype; /* XI_Motion, XI_ButtonPress, XI_ButtonRelease, XI_KeyPress, XI_KeyRelease */ - uint16_t buttons_len; uint16_t valuators_len; - uint16_t pad0; uint32_t pad1; + uint32_t pad2; } xXIRawDeviceEvent; /*********************************************************** diff --git a/XI2proto.txt b/XI2proto.txt index bf405ee..a3edcb9 100644 --- a/XI2proto.txt +++ b/XI2proto.txt @@ -803,9 +803,7 @@ EVENTHEADER { type: BYTE EVENTHEADER eventtype: RAWTYPE detail: CARD32 - buttons_len: CARD16 valuators_len: CARD16 - buttons: SETofBUTTONMASK valuators: SETofVALUATORMASK axisvalues: LISTofFP3232 axisvalues_raw: LISTofFP3232 @@ -827,12 +825,8 @@ EVENTHEADER { type: BYTE The type of event that occured on the device. detail The button number or keycode. - buttons_len - The length of 'buttons' in 4 byte units. valuators_len The length of 'valuators' in 4 byte units. - buttons - Button state before the event. valuators Bitmask of valuators provided in 'axisvalues' and 'axisvalues_raw'. axisvalues -- cgit v1.2.3