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

touchpad: use the evdev device's filter struct

Browse source 
We don't need a separate filter struct, we can use the parent evdev device.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2014-09-22 09:35:53 +10:00
parent 25c11afd9c
commit a721292c25
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/evdev-mt-touchpad.c
View file

@ -65,7 +65,7 @@ tp_filter_motion(struct tp_dispatch *tp,
motion.dy = *dy * tp->accel.y_scale_coeff;
if (motion.dx != 0.0 || motion.dy != 0.0)
filter_dispatch(tp->filter, &motion, tp, time);
filter_dispatch(tp->device->pointer.filter, &motion, tp, time);
*dx = motion.dx;
*dy = motion.dy;
@ -602,7 +602,6 @@ tp_destroy(struct evdev_dispatch *dispatch)
tp_destroy_tap(tp);
tp_destroy_buttons(tp);
filter_destroy(tp->filter);
free(tp->touches);
free(tp);
}
@ -849,7 +848,7 @@ tp_init_accel(struct tp_dispatch *tp, double diagonal)
if (accel == NULL)
return -1;
tp->filter = accel;
tp->device->pointer.filter = accel;
return 0;
}

2
src/evdev-mt-touchpad.h
View file

@ -167,8 +167,6 @@ struct tp_dispatch {
int32_t margin_y;
} hysteresis;
struct motion_filter *filter;
struct {
double x_scale_coeff;
double y_scale_coeff;