diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-13 15:09:38 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-15 10:36:30 +1000 |
| commit | d040af7fa3c7314917414a28d723bdda3c4289c3 (patch) | |
| tree | 8dd6d00a1c3e97477d3d87083193feb8948f0898 /include | |
| parent | 81b64f668541217c1c9518ac4a7e3fdf0a6e4002 (diff) | |
Update to type-specific raw events - require inputproto 1.9.99.14.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/events.h | 9 | ||||
| -rw-r--r-- | include/inputstr.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/events.h b/include/events.h index d34637eba..4b0c6dcb4 100644 --- a/include/events.h +++ b/include/events.h @@ -41,6 +41,7 @@ * protocol. * * Note: Keep KeyPress to Motion aligned with the core events. + * Keep ET_Raw* in the same order as KeyPress - Motion */ enum { ET_KeyPress = 2, @@ -59,7 +60,11 @@ enum { #if XFreeXDGA ET_DGAEvent, #endif - ET_Raw, + ET_RawKeyPress, + ET_RawKeyRelease, + ET_RawButtonPress, + ET_RawButtonRelease, + ET_RawMotion, ET_Internal = 0xFF /* First byte */ } EventType; @@ -193,8 +198,6 @@ typedef struct int type; /**< ET_Raw */ int length; /**< Length in bytes */ Time time; /**< Time in ms */ - int subtype; /**< KeyPress, KeyRelease, ButtonPress, - ButtonRelease, MotionNotify */ int deviceid; /**< Device to post this event for */ int sourceid; /**< The physical source device */ union { diff --git a/include/inputstr.h b/include/inputstr.h index 73750e0e3..29ad5a814 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -69,7 +69,7 @@ SOFTWARE. * events to the protocol, the server will not support these events until * this number here is bumped. */ -#define XI2LASTEVENT 13 /* XI_PropertyEvent */ +#define XI2LASTEVENT 17 /* XI_RawMotion */ #define XI2MASKSIZE ((XI2LASTEVENT + 7)/8) /* no of bits for masks */ /** |