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

tablet: factor out checking a device for axes

Browse source 
This gets more complicated for axes that aren't a 1:1 relationship with event
codes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Stephen Chandler Paul <thatslyude@gmail.com>
This commit is contained in:
Peter Hutterer 2015-02-16 16:25:39 +10:00
parent d43f92b464
commit 8f56a7ea93
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/evdev-tablet.c
View file

@ -40,6 +40,18 @@
#define tablet_get_released_buttons(tablet_,field_) \ #define tablet_get_released_buttons(tablet_,field_) \
((tablet_)->prev_button_state.field_ & ~((tablet_)->button_state.field_)) ((tablet_)->prev_button_state.field_ & ~((tablet_)->button_state.field_))
static int
tablet_device_has_axis(struct tablet_dispatch *tablet,
enum libinput_tablet_axis axis)
{
unsigned int code;
code = axis_to_evcode(axis);
return libevdev_has_event_code(tablet->device->evdev,
EV_ABS,
code);
}
static void static void
tablet_process_absolute(struct tablet_dispatch *tablet, tablet_process_absolute(struct tablet_dispatch *tablet,
struct evdev_device *device, struct evdev_device *device,
@ -96,9 +108,7 @@ tablet_mark_all_axes_changed(struct tablet_dispatch *tablet,
enum libinput_tablet_axis a; enum libinput_tablet_axis a;
for (a = LIBINPUT_TABLET_AXIS_X; a <= LIBINPUT_TABLET_AXIS_MAX; a++) { for (a = LIBINPUT_TABLET_AXIS_X; a <= LIBINPUT_TABLET_AXIS_MAX; a++) {
if (libevdev_has_event_code(device->evdev, if (tablet_device_has_axis(tablet, a))
EV_ABS,
axis_to_evcode(a)))
set_bit(tablet->changed_axes, a); set_bit(tablet->changed_axes, a);
} }
@ -647,9 +657,7 @@ tablet_init(struct tablet_dispatch *tablet,
for (axis = LIBINPUT_TABLET_AXIS_X; for (axis = LIBINPUT_TABLET_AXIS_X;
axis <= LIBINPUT_TABLET_AXIS_MAX; axis <= LIBINPUT_TABLET_AXIS_MAX;
axis++) { axis++) {
if (libevdev_has_event_code(device->evdev, if (tablet_device_has_axis(tablet, axis))
EV_ABS,
axis_to_evcode(axis)))
set_bit(tablet->axis_caps, axis); set_bit(tablet->axis_caps, axis);
} }