summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2016-07-04 15:32:54 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2016-08-11 19:56:16 +1000
commit4b94fc62737ef53b5fcc52d49a6907ad41604d47 (patch)
tree5525d14fcc0cf699a120ed6128882933beae91cb
parentaac42ca528a1e272a6e67c2f2df972a90ab7e997 (diff)
evdev: reshuffle the evdev_device struct fields
Have the ungrouped items at the top of the struct for better visibility. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev.h24
1 files changed, 10 insertions, 14 deletions
diff --git a/src/evdev.h b/src/evdev.h
index ee53dec..778998e 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -138,6 +138,16 @@ struct evdev_device {
const char *devname;
bool was_removed;
int fd;
+ enum evdev_device_seat_capability seat_caps;
+ enum evdev_device_tags tags;
+ int is_mt;
+ int suspended;
+ int dpi; /* HW resolution */
+ struct ratelimit syn_drop_limit; /* ratelimit for SYN_DROPPED logging */
+ struct ratelimit nonpointer_rel_limit; /* ratelimit for REL_* events from non-pointer devices */
+ uint32_t model_flags;
+ struct mtdev *mtdev;
+
struct {
const struct input_absinfo *absinfo_x, *absinfo_y;
int fake_resolution;
@@ -153,8 +163,6 @@ struct evdev_device {
struct device_coords dimensions;
} abs;
- struct mtdev *mtdev;
-
struct {
struct libinput_timer timer;
struct libinput_device_config_scroll_method config;
@@ -185,12 +193,6 @@ struct evdev_device {
int wheel_click_angle;
} scroll;
- enum evdev_device_seat_capability seat_caps;
- enum evdev_device_tags tags;
-
- int is_mt;
- int suspended;
-
struct {
struct libinput_device_config_accel config;
struct motion_filter *filter;
@@ -222,12 +224,6 @@ struct evdev_device {
uint32_t button_mask;
uint64_t first_event_time;
} middlebutton;
-
- int dpi; /* HW resolution */
- struct ratelimit syn_drop_limit; /* ratelimit for SYN_DROPPED logging */
- struct ratelimit nonpointer_rel_limit; /* ratelimit for REL_* events from non-pointer devices */
-
- uint32_t model_flags;
};
#define EVDEV_UNHANDLED_DEVICE ((struct evdev_device *) 1)