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

filter: rename speed to speed_adjustment where it's in the [-1,1] range

Browse source 
To avoid confusion with the other speed in units/time

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2015-08-04 15:48:40 +10:00
parent c0a1d22fea
commit b750c7d69f
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/filter-private.h
View file

@ -38,11 +38,11 @@ struct motion_filter_interface {
uint64_t time);
void (*destroy)(struct motion_filter *filter);
bool (*set_speed)(struct motion_filter *filter,
double speed);
double speed_adjustment);
};
struct motion_filter {
double speed; /* normalized [-1, 1] */
double speed_adjustment; /* normalized [-1, 1] */
struct motion_filter_interface *interface;
};

18
src/filter.c
View file

@ -62,15 +62,15 @@ filter_destroy(struct motion_filter *filter)
bool
filter_set_speed(struct motion_filter *filter,
double speed)
double speed_adjustment)
{
return filter->interface->set_speed(filter, speed);
return filter->interface->set_speed(filter, speed_adjustment);
}
double
filter_get_speed(struct motion_filter *filter)
{
return filter->speed;
return filter->speed_adjustment;
}
/*
@ -325,25 +325,25 @@ accelerator_destroy(struct motion_filter *filter)
static bool
accelerator_set_speed(struct motion_filter *filter,
double speed)
double speed_adjustment)
{
struct pointer_accelerator *accel_filter =
(struct pointer_accelerator *)filter;
assert(speed >= -1.0 && speed <= 1.0);
assert(speed_adjustment >= -1.0 && speed_adjustment <= 1.0);
/* delay when accel kicks in */
accel_filter->threshold = DEFAULT_THRESHOLD - speed / 4000.0;
accel_filter->threshold = DEFAULT_THRESHOLD - speed_adjustment / 4000.0;
if (accel_filter->threshold < MINIMUM_THRESHOLD)
accel_filter->threshold = MINIMUM_THRESHOLD;
/* adjust max accel factor */
accel_filter->accel = DEFAULT_ACCELERATION + speed * 1.5;
accel_filter->accel = DEFAULT_ACCELERATION + speed_adjustment * 1.5;
/* higher speed -> faster to reach max */
accel_filter->incline = DEFAULT_INCLINE + speed * 0.75;
accel_filter->incline = DEFAULT_INCLINE + speed_adjustment * 0.75;
filter->speed = speed;
filter->speed_adjustment = speed_adjustment;
return true;
}