fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-09 05:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

evdev: split evdev_dispatch and fallback_dispatch into separate entities

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2016-07-04 14:34:56 +10:00
parent 0a27faec78
commit aac42ca528
4 changed files with 58 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/evdev-tablet.c
View file

@ -1535,7 +1535,7 @@ tablet_init_calibration(struct tablet_dispatch *tablet,
struct evdev_device *device) struct evdev_device *device)
{ {
if (libevdev_has_property(device->evdev, INPUT_PROP_DIRECT)) if (libevdev_has_property(device->evdev, INPUT_PROP_DIRECT))
evdev_init_calibration(device, &tablet->base); evdev_init_calibration(device, &tablet->calibration);
} }
static void static void

2
src/evdev-tablet.h
View file

@ -69,6 +69,8 @@ struct tablet_dispatch {
uint32_t current_tool_serial; uint32_t current_tool_serial;
uint32_t cursor_proximity_threshold; uint32_t cursor_proximity_threshold;
struct libinput_device_config_calibration calibration;
}; };
static inline enum libinput_tablet_tool_axis static inline enum libinput_tablet_tool_axis

81
src/evdev.c
View file

@ -92,13 +92,13 @@ static const struct evdev_udev_tag_match evdev_udev_tag_matches[] = {
}; };
static void static void
hw_set_key_down(struct evdev_dispatch *dispatch, int code, int pressed) hw_set_key_down(struct fallback_dispatch *dispatch, int code, int pressed)
{ {
long_set_bit_state(dispatch->hw_key_mask, code, pressed); long_set_bit_state(dispatch->hw_key_mask, code, pressed);
} }
static bool static bool
hw_is_key_down(struct evdev_dispatch *dispatch, int code) hw_is_key_down(struct fallback_dispatch *dispatch, int code)
{ {
return long_bit_is_set(dispatch->hw_key_mask, code); return long_bit_is_set(dispatch->hw_key_mask, code);
} }
@ -132,7 +132,7 @@ update_key_down_count(struct evdev_device *device, int code, int pressed)
} }
static void static void
evdev_keyboard_notify_key(struct evdev_dispatch *dispatch, evdev_keyboard_notify_key(struct fallback_dispatch *dispatch,
struct evdev_device *device, struct evdev_device *device,
uint64_t time, uint64_t time,
int key, int key,
@ -350,7 +350,7 @@ evdev_post_trackpoint_scroll(struct evdev_device *device,
static inline bool static inline bool
evdev_filter_defuzz_touch(struct evdev_device *device, struct mt_slot *slot) evdev_filter_defuzz_touch(struct evdev_device *device, struct mt_slot *slot)
{ {
struct evdev_dispatch *dispatch = device->dispatch; struct fallback_dispatch *dispatch = (struct fallback_dispatch*)device->dispatch;
struct device_coords point; struct device_coords point;
if (!dispatch->mt.want_hysteresis) if (!dispatch->mt.want_hysteresis)
@ -373,7 +373,7 @@ evdev_filter_defuzz_touch(struct evdev_device *device, struct mt_slot *slot)
} }
static inline void static inline void
evdev_rotate_relative(struct evdev_dispatch *dispatch, evdev_rotate_relative(struct fallback_dispatch *dispatch,
struct evdev_device *device) struct evdev_device *device)
{ {
struct device_coords rel = dispatch->rel; struct device_coords rel = dispatch->rel;
@ -391,7 +391,7 @@ evdev_rotate_relative(struct evdev_dispatch *dispatch,
static void static void
evdev_flush_pending_event(struct evdev_device *device, uint64_t time) evdev_flush_pending_event(struct evdev_device *device, uint64_t time)
{ {
struct evdev_dispatch *dispatch = device->dispatch; struct fallback_dispatch *dispatch = (struct fallback_dispatch*)device->dispatch;
struct libinput *libinput = evdev_libinput_context(device); struct libinput *libinput = evdev_libinput_context(device);
int slot_idx; int slot_idx;
int seat_slot; int seat_slot;
@ -602,7 +602,7 @@ static void
evdev_process_touch_button(struct evdev_device *device, evdev_process_touch_button(struct evdev_device *device,
uint64_t time, int value) uint64_t time, int value)
{ {
struct evdev_dispatch *dispatch = device->dispatch; struct fallback_dispatch *dispatch = (struct fallback_dispatch*)device->dispatch;
if (dispatch->pending_event != EVDEV_NONE && if (dispatch->pending_event != EVDEV_NONE &&
dispatch->pending_event != EVDEV_ABSOLUTE_MOTION) dispatch->pending_event != EVDEV_ABSOLUTE_MOTION)
@ -614,7 +614,7 @@ evdev_process_touch_button(struct evdev_device *device,
} }
static inline void static inline void
evdev_process_key(struct evdev_dispatch *dispatch, evdev_process_key(struct fallback_dispatch *dispatch,
struct evdev_device *device, struct evdev_device *device,
struct input_event *e, uint64_t time) struct input_event *e, uint64_t time)
{ {
@ -677,7 +677,7 @@ evdev_process_touch(struct evdev_device *device,
struct input_event *e, struct input_event *e,
uint64_t time) uint64_t time)
{ {
struct evdev_dispatch *dispatch = device->dispatch; struct fallback_dispatch *dispatch = (struct fallback_dispatch*)device->dispatch;
switch (e->code) { switch (e->code) {
case ABS_MT_SLOT: case ABS_MT_SLOT:
@ -718,7 +718,7 @@ static inline void
evdev_process_absolute_motion(struct evdev_device *device, evdev_process_absolute_motion(struct evdev_device *device,
struct input_event *e) struct input_event *e)
{ {
struct evdev_dispatch *dispatch = device->dispatch; struct fallback_dispatch *dispatch = (struct fallback_dispatch*)device->dispatch;
switch (e->code) { switch (e->code) {
case ABS_X: case ABS_X:
@ -781,7 +781,7 @@ static inline void
evdev_process_relative(struct evdev_device *device, evdev_process_relative(struct evdev_device *device,
struct input_event *e, uint64_t time) struct input_event *e, uint64_t time)
{ {
struct evdev_dispatch *dispatch = device->dispatch; struct fallback_dispatch *dispatch = (struct fallback_dispatch*)device->dispatch;
struct normalized_coords wheel_degrees = { 0.0, 0.0 }; struct normalized_coords wheel_degrees = { 0.0, 0.0 };
struct discrete_coords discrete = { 0.0, 0.0 }; struct discrete_coords discrete = { 0.0, 0.0 };
@ -842,7 +842,7 @@ evdev_process_absolute(struct evdev_device *device,
} }
static inline bool static inline bool
evdev_any_button_down(struct evdev_dispatch *dispatch, evdev_any_button_down(struct fallback_dispatch *dispatch,
struct evdev_device *device) struct evdev_device *device)
{ {
unsigned int button; unsigned int button;
@ -858,7 +858,7 @@ evdev_any_button_down(struct evdev_dispatch *dispatch,
static inline bool static inline bool
evdev_need_touch_frame(struct evdev_device *device) evdev_need_touch_frame(struct evdev_device *device)
{ {
struct evdev_dispatch *dispatch = device->dispatch; struct fallback_dispatch *dispatch = (struct fallback_dispatch*)device->dispatch;
if (!(device->seat_caps & EVDEV_DEVICE_TOUCH)) if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
return false; return false;
@ -921,11 +921,12 @@ evdev_tag_keyboard(struct evdev_device *device,
} }
static void static void
fallback_process(struct evdev_dispatch *dispatch, fallback_process(struct evdev_dispatch *evdev_dispatch,
struct evdev_device *device, struct evdev_device *device,
struct input_event *event, struct input_event *event,
uint64_t time) uint64_t time)
{ {
struct fallback_dispatch *dispatch = (struct fallback_dispatch*)evdev_dispatch;
bool need_frame = false; bool need_frame = false;
switch (event->type) { switch (event->type) {
@ -948,7 +949,7 @@ fallback_process(struct evdev_dispatch *dispatch,
} }
static void static void
release_pressed_keys(struct evdev_dispatch *dispatch, release_pressed_keys(struct fallback_dispatch *dispatch,
struct evdev_device *device) struct evdev_device *device)
{ {
struct libinput *libinput = evdev_libinput_context(device); struct libinput *libinput = evdev_libinput_context(device);
@ -1002,16 +1003,20 @@ release_pressed_keys(struct evdev_dispatch *dispatch,
} }
static void static void
fallback_suspend(struct evdev_dispatch *dispatch, fallback_suspend(struct evdev_dispatch *evdev_dispatch,
struct evdev_device *device) struct evdev_device *device)
{ {
struct fallback_dispatch *dispatch = (struct fallback_dispatch*)evdev_dispatch;
release_pressed_keys(dispatch, device); release_pressed_keys(dispatch, device);
memset(dispatch->hw_key_mask, 0, sizeof(dispatch->hw_key_mask)); memset(dispatch->hw_key_mask, 0, sizeof(dispatch->hw_key_mask));
} }
static void static void
fallback_destroy(struct evdev_dispatch *dispatch) fallback_destroy(struct evdev_dispatch *evdev_dispatch)
{ {
struct fallback_dispatch *dispatch = (struct fallback_dispatch*)evdev_dispatch;
free(dispatch->mt.slots); free(dispatch->mt.slots);
free(dispatch); free(dispatch);
} }
@ -1127,7 +1132,7 @@ evdev_left_handed_has(struct libinput_device *device)
static void static void
evdev_change_to_left_handed(struct evdev_device *device) evdev_change_to_left_handed(struct evdev_device *device)
{ {
struct evdev_dispatch *dispatch = device->dispatch; struct fallback_dispatch *dispatch = (struct fallback_dispatch*)device->dispatch;
if (device->left_handed.want_enabled == device->left_handed.enabled) if (device->left_handed.want_enabled == device->left_handed.enabled)
return; return;
@ -1189,7 +1194,7 @@ evdev_scroll_get_methods(struct libinput_device *device)
static void static void
evdev_change_scroll_method(struct evdev_device *device) evdev_change_scroll_method(struct evdev_device *device)
{ {
struct evdev_dispatch *dispatch = device->dispatch; struct fallback_dispatch *dispatch = (struct fallback_dispatch*)device->dispatch;
if (device->scroll.want_method == device->scroll.method && if (device->scroll.want_method == device->scroll.method &&
device->scroll.want_button == device->scroll.button) device->scroll.want_button == device->scroll.button)
@ -1299,14 +1304,14 @@ evdev_init_button_scroll(struct evdev_device *device,
void void
evdev_init_calibration(struct evdev_device *device, evdev_init_calibration(struct evdev_device *device,
struct evdev_dispatch *dispatch) struct libinput_device_config_calibration *calibration)
{ {
device->base.config.calibration = &dispatch->calibration; device->base.config.calibration = calibration;
dispatch->calibration.has_matrix = evdev_calibration_has_matrix; calibration->has_matrix = evdev_calibration_has_matrix;
dispatch->calibration.set_matrix = evdev_calibration_set_matrix; calibration->set_matrix = evdev_calibration_set_matrix;
dispatch->calibration.get_matrix = evdev_calibration_get_matrix; calibration->get_matrix = evdev_calibration_get_matrix;
dispatch->calibration.get_default_matrix = evdev_calibration_get_default_matrix; calibration->get_default_matrix = evdev_calibration_get_default_matrix;
} }
static void static void
@ -1374,10 +1379,11 @@ evdev_rotation_config_is_available(struct libinput_device *device)
} }
static enum libinput_config_status static enum libinput_config_status
evdev_rotation_config_set_angle(struct libinput_device *device, evdev_rotation_config_set_angle(struct libinput_device *libinput_device,
unsigned int degrees_cw) unsigned int degrees_cw)
{ {
struct evdev_dispatch *dispatch = ((struct evdev_device*)device)->dispatch; struct evdev_device *device = (struct evdev_device*)libinput_device;
struct fallback_dispatch *dispatch = (struct fallback_dispatch*)device->dispatch;
dispatch->rotation.angle = degrees_cw; dispatch->rotation.angle = degrees_cw;
matrix_init_rotate(&dispatch->rotation.matrix, degrees_cw); matrix_init_rotate(&dispatch->rotation.matrix, degrees_cw);
@ -1386,9 +1392,10 @@ evdev_rotation_config_set_angle(struct libinput_device *device,
} }
static unsigned int static unsigned int
evdev_rotation_config_get_angle(struct libinput_device *device) evdev_rotation_config_get_angle(struct libinput_device *libinput_device)
{ {
struct evdev_dispatch *dispatch = ((struct evdev_device*)device)->dispatch; struct evdev_device *device = (struct evdev_device*)libinput_device;
struct fallback_dispatch *dispatch = (struct fallback_dispatch*)device->dispatch;
return dispatch->rotation.angle; return dispatch->rotation.angle;
} }
@ -1401,7 +1408,7 @@ evdev_rotation_config_get_default_angle(struct libinput_device *device)
static void static void
evdev_init_rotation(struct evdev_device *device, evdev_init_rotation(struct evdev_device *device,
struct evdev_dispatch *dispatch) struct fallback_dispatch *dispatch)
{ {
if ((device->model_flags & EVDEV_MODEL_TRACKBALL) == 0) if ((device->model_flags & EVDEV_MODEL_TRACKBALL) == 0)
return; return;
@ -1438,7 +1445,7 @@ evdev_is_fake_mt_device(struct evdev_device *device)
} }
static inline int static inline int
fallback_dispatch_init_slots(struct evdev_dispatch *dispatch, fallback_dispatch_init_slots(struct fallback_dispatch *dispatch,
struct evdev_device *device) struct evdev_device *device)
{ {
struct libevdev *evdev = device->evdev; struct libevdev *evdev = device->evdev;
@ -1500,7 +1507,7 @@ fallback_dispatch_init_slots(struct evdev_dispatch *dispatch,
} }
static inline void static inline void
fallback_dispatch_init_rel(struct evdev_dispatch *dispatch, fallback_dispatch_init_rel(struct fallback_dispatch *dispatch,
struct evdev_device *device) struct evdev_device *device)
{ {
dispatch->rel.x = 0; dispatch->rel.x = 0;
@ -1510,13 +1517,13 @@ fallback_dispatch_init_rel(struct evdev_dispatch *dispatch,
static struct evdev_dispatch * static struct evdev_dispatch *
fallback_dispatch_create(struct libinput_device *device) fallback_dispatch_create(struct libinput_device *device)
{ {
struct evdev_dispatch *dispatch = zalloc(sizeof *dispatch); struct fallback_dispatch *dispatch = zalloc(sizeof *dispatch);
struct evdev_device *evdev_device = (struct evdev_device *)device; struct evdev_device *evdev_device = (struct evdev_device *)device;
if (dispatch == NULL) if (dispatch == NULL)
return NULL; return NULL;
dispatch->interface = &fallback_interface; dispatch->base.interface = &fallback_interface;
dispatch->pending_event = EVDEV_NONE; dispatch->pending_event = EVDEV_NONE;
fallback_dispatch_init_rel(dispatch, evdev_device); fallback_dispatch_init_rel(dispatch, evdev_device);
@ -1536,8 +1543,8 @@ fallback_dispatch_create(struct libinput_device *device)
if (evdev_device->scroll.natural_scrolling_enabled) if (evdev_device->scroll.natural_scrolling_enabled)
evdev_init_natural_scroll(evdev_device); evdev_init_natural_scroll(evdev_device);
evdev_init_calibration(evdev_device, dispatch); evdev_init_calibration(evdev_device, &dispatch->calibration);
evdev_init_sendevents(evdev_device, dispatch); evdev_init_sendevents(evdev_device, &dispatch->base);
evdev_init_rotation(evdev_device, dispatch); evdev_init_rotation(evdev_device, dispatch);
/* BTN_MIDDLE is set on mice even when it's not present. So /* BTN_MIDDLE is set on mice even when it's not present. So
@ -1558,7 +1565,7 @@ fallback_dispatch_create(struct libinput_device *device)
want_config); want_config);
} }
return dispatch; return &dispatch->base;
} }
static inline void static inline void

17
src/evdev.h
View file

@ -275,6 +275,16 @@ struct evdev_dispatch_interface {
struct evdev_dispatch { struct evdev_dispatch {
struct evdev_dispatch_interface *interface; struct evdev_dispatch_interface *interface;
struct {
struct libinput_device_config_send_events config;
enum libinput_config_send_events_mode current_mode;
} sendevents;
};
struct fallback_dispatch {
struct evdev_dispatch base;
struct libinput_device_config_calibration calibration; struct libinput_device_config_calibration calibration;
struct { struct {
@ -284,11 +294,6 @@ struct evdev_dispatch {
struct libinput_device_config_rotation config; struct libinput_device_config_rotation config;
} rotation; } rotation;
struct {
struct libinput_device_config_send_events config;
enum libinput_config_send_events_mode current_mode;
} sendevents;
struct { struct {
int slot; int slot;
struct mt_slot *slots; struct mt_slot *slots;
@ -320,7 +325,7 @@ evdev_transform_relative(struct evdev_device *device,
void void
evdev_init_calibration(struct evdev_device *device, evdev_init_calibration(struct evdev_device *device,
struct evdev_dispatch *dispatch); struct libinput_device_config_calibration *calibration);
void void
evdev_device_init_pointer_acceleration(struct evdev_device *device, evdev_device_init_pointer_acceleration(struct evdev_device *device,