diff options
Diffstat (limited to 'src/state.h')
| -rw-r--r-- | src/state.h | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/src/state.h b/src/state.h index df12139..4e98a08 100644 --- a/src/state.h +++ b/src/state.h | |||
| @@ -37,9 +37,29 @@ | |||
| 37 | * @abs: current values of ABS_MT axes for this slot | 37 | * @abs: current values of ABS_MT axes for this slot |
| 38 | */ | 38 | */ |
| 39 | struct mtdev_slot { | 39 | struct mtdev_slot { |
| 40 | int abs[MT_ABS_SIZE]; | 40 | int touch_major; |
| 41 | int touch_minor; | ||
| 42 | int width_major; | ||
| 43 | int width_minor; | ||
| 44 | int orientation; | ||
| 45 | int position_x; | ||
| 46 | int position_y; | ||
| 47 | int tool_type; | ||
| 48 | int blob_id; | ||
| 49 | int tracking_id; | ||
| 50 | int pressure; | ||
| 41 | }; | 51 | }; |
| 42 | 52 | ||
| 53 | static inline int get_sval(const struct mtdev_slot *slot, int ix) | ||
| 54 | { | ||
| 55 | return (&slot->touch_major)[ix]; | ||
| 56 | } | ||
| 57 | |||
| 58 | static inline void set_sval(struct mtdev_slot *slot, int ix, int value) | ||
| 59 | { | ||
| 60 | (&slot->touch_major)[ix] = value; | ||
| 61 | } | ||
| 62 | |||
| 43 | /* | 63 | /* |
| 44 | * struct mtdev_state - MT slot parsing | 64 | * struct mtdev_state - MT slot parsing |
| 45 | * @inbuf: input event buffer | 65 | * @inbuf: input event buffer |
| @@ -50,10 +70,15 @@ struct mtdev_slot { | |||
| 50 | * @lastid: last used tracking id | 70 | * @lastid: last used tracking id |
| 51 | */ | 71 | */ |
| 52 | struct mtdev_state { | 72 | struct mtdev_state { |
| 73 | |||
| 74 | int has_ext_abs[MT_ABS_SIZE - 11]; | ||
| 75 | struct input_absinfo ext_abs[MT_ABS_SIZE - 11]; | ||
| 76 | |||
| 53 | struct mtdev_iobuf iobuf; | 77 | struct mtdev_iobuf iobuf; |
| 54 | struct mtdev_evbuf inbuf; | 78 | struct mtdev_evbuf inbuf; |
| 55 | struct mtdev_evbuf outbuf; | 79 | struct mtdev_evbuf outbuf; |
| 56 | struct mtdev_slot data[DIM_FINGER]; | 80 | struct mtdev_slot data[DIM_FINGER]; |
| 81 | |||
| 57 | bitmask_t used; | 82 | bitmask_t used; |
| 58 | bitmask_t slot; | 83 | bitmask_t slot; |
| 59 | bitmask_t lastid; | 84 | bitmask_t lastid; |
