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

filter: tidy up the touchpad filter

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2018-04-11 11:14:56 +10:00
parent 6135e1d878
commit cae84b84ae
1 changed files with 9 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/filter-touchpad.c
View file

@ -42,15 +42,6 @@
*/
#define TP_MAGIC_SLOWDOWN 0.37 /* unitless factor */
/*
* Default parameters for pointer acceleration profiles.
*/
#define DEFAULT_THRESHOLD v_ms2us(0.4) /* in units/us */
#define MINIMUM_THRESHOLD v_ms2us(0.2) /* in units/us */
#define DEFAULT_ACCELERATION 2.0 /* unitless factor */
#define DEFAULT_INCLINE 1.1 /* unitless factor */
/* Touchpad acceleration */
#define TOUCHPAD_DEFAULT_THRESHOLD 254 /* mm/s */
#define TOUCHPAD_THRESHOLD_RANGE 184 /* mm/s */
@ -281,24 +272,6 @@ touchpad_accel_profile_linear(struct motion_filter *filter,
return factor * TP_MAGIC_SLOWDOWN;
}
static struct pointer_accelerator *
create_default_filter(int dpi)
{
struct pointer_accelerator *filter;
filter = zalloc(sizeof *filter);
filter->last_velocity = 0.0;
init_trackers(&filter->trackers, NUM_POINTER_TRACKERS);
filter->threshold = DEFAULT_THRESHOLD;
filter->accel = DEFAULT_ACCELERATION;
filter->incline = DEFAULT_INCLINE;
filter->dpi = dpi;
return filter;
}
struct motion_filter_interface accelerator_interface_touchpad = {
.type = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE,
.filter = accelerator_filter_post_normalized,
@ -316,9 +289,15 @@ create_pointer_accelerator_filter_touchpad(int dpi,
struct pointer_accelerator *filter;
struct pointer_delta_smoothener *smoothener;
filter = create_default_filter(dpi);
if (!filter)
return NULL;
filter = zalloc(sizeof *filter);
filter->last_velocity = 0.0;
init_trackers(&filter->trackers, NUM_POINTER_TRACKERS);
filter->threshold = TOUCHPAD_DEFAULT_THRESHOLD;
filter->accel = TOUCHPAD_ACCELERATION;
filter->incline = TOUCHPAD_INCLINE;
filter->dpi = dpi;
filter->base.interface = &accelerator_interface_touchpad;
filter->profile = touchpad_accel_profile_linear;