eventstr: _DeviceEvent 432 -> 424 bytes, _RawDeviceEvent 624 -> 616 bytes
- saved per 8 bytes for structs Signed-off-by: Herman Semenov <GermanAizek@yandex.ru>
This commit is contained in:
parent
621956f5fd
commit
c1218d27ca
|
@ -101,6 +101,7 @@ enum DeviceEventSource {
|
||||||
*/
|
*/
|
||||||
struct _DeviceEvent {
|
struct _DeviceEvent {
|
||||||
unsigned char header; /**< Always ET_Internal */
|
unsigned char header; /**< Always ET_Internal */
|
||||||
|
int16_t root_x; /**< Pos relative to root window in integral data */
|
||||||
enum EventType type; /**< One of EventType */
|
enum EventType type; /**< One of EventType */
|
||||||
int length; /**< Length in bytes */
|
int length; /**< Length in bytes */
|
||||||
Time time; /**< Time in ms */
|
Time time; /**< Time in ms */
|
||||||
|
@ -112,10 +113,10 @@ struct _DeviceEvent {
|
||||||
uint32_t key; /**< Key code */
|
uint32_t key; /**< Key code */
|
||||||
} detail;
|
} detail;
|
||||||
uint32_t touchid; /**< Touch ID (client_id) */
|
uint32_t touchid; /**< Touch ID (client_id) */
|
||||||
int16_t root_x; /**< Pos relative to root window in integral data */
|
|
||||||
float root_x_frac; /**< Pos relative to root window in frac part */
|
|
||||||
int16_t root_y; /**< Pos relative to root window in integral part */
|
int16_t root_y; /**< Pos relative to root window in integral part */
|
||||||
|
float root_x_frac; /**< Pos relative to root window in frac part */
|
||||||
float root_y_frac; /**< Pos relative to root window in frac part */
|
float root_y_frac; /**< Pos relative to root window in frac part */
|
||||||
|
enum DeviceEventSource source_type; /**< How this event was provoked */
|
||||||
uint8_t buttons[(MAX_BUTTONS + 7) / 8]; /**< Button mask */
|
uint8_t buttons[(MAX_BUTTONS + 7) / 8]; /**< Button mask */
|
||||||
struct {
|
struct {
|
||||||
uint8_t mask[(MAX_VALUATORS + 7) / 8];/**< Valuator mask */
|
uint8_t mask[(MAX_VALUATORS + 7) / 8];/**< Valuator mask */
|
||||||
|
@ -139,7 +140,6 @@ struct _DeviceEvent {
|
||||||
int key_repeat; /**< Internally-generated key repeat event */
|
int key_repeat; /**< Internally-generated key repeat event */
|
||||||
uint32_t flags; /**< Flags to be copied into the generated event */
|
uint32_t flags; /**< Flags to be copied into the generated event */
|
||||||
uint32_t resource; /**< Touch event resource, only for TOUCH_REPLAYING */
|
uint32_t resource; /**< Touch event resource, only for TOUCH_REPLAYING */
|
||||||
enum DeviceEventSource source_type; /**< How this event was provoked */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -239,12 +239,12 @@ struct _RawDeviceEvent {
|
||||||
uint32_t button; /**< Button number */
|
uint32_t button; /**< Button number */
|
||||||
uint32_t key; /**< Key code */
|
uint32_t key; /**< Key code */
|
||||||
} detail;
|
} detail;
|
||||||
|
uint32_t flags; /**< Flags to be copied into the generated event */
|
||||||
struct {
|
struct {
|
||||||
uint8_t mask[(MAX_VALUATORS + 7) / 8];/**< Valuator mask */
|
uint8_t mask[(MAX_VALUATORS + 7) / 8];/**< Valuator mask */
|
||||||
double data[MAX_VALUATORS]; /**< Valuator data */
|
double data[MAX_VALUATORS]; /**< Valuator data */
|
||||||
double data_raw[MAX_VALUATORS]; /**< Valuator data as posted */
|
double data_raw[MAX_VALUATORS]; /**< Valuator data as posted */
|
||||||
} valuators;
|
} valuators;
|
||||||
uint32_t flags; /**< Flags to be copied into the generated event */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _BarrierEvent {
|
struct _BarrierEvent {
|
||||||
|
|
Loading…
Reference in New Issue