diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-10 12:26:18 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-03-12 11:44:20 +1000 |
| commit | fc7f67959ad72c76e852827963d6a42b7d533b89 (patch) | |
| tree | 81d912c1c8aedd61a0798b4d58647eb5b62bc51d | |
| parent | d2ba9af0517f54fb58358e41859f5e4ead9b64f2 (diff) | |
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.
| -rw-r--r-- | XI2proto.h | 3 | ||||
| -rw-r--r-- | XI2proto.txt | 6 |
2 files changed, 1 insertions, 8 deletions
@@ -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 |