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

touchpad: Refactor tp_get_*_touches_delta

Browse source 
The two tp_get_*_touches_delta functions are almost identical, refactor
them into one function.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Hans de Goede 2015-02-17 11:44:06 +01:00
parent 2e8403e762
commit 88d87e763c
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/evdev-mt-touchpad-gestures.c
View file

@ -32,7 +32,7 @@
#define DEFAULT_GESTURE_SWITCH_TIMEOUT 100 /* ms */
static void
tp_get_average_touches_delta(struct tp_dispatch *tp, double *dx, double *dy)
tp_get_touches_delta(struct tp_dispatch *tp, double *dx, double *dy, bool average)
{
struct tp_touch *t;
unsigned int i, nchanged = 0;
@ -53,30 +53,23 @@ tp_get_average_touches_delta(struct tp_dispatch *tp, double *dx, double *dy)
}
}
if (nchanged == 0)
if (!average || nchanged == 0)
return;
*dx /= nchanged;
*dy /= nchanged;
}
static void
static inline void
tp_get_combined_touches_delta(struct tp_dispatch *tp, double *dx, double *dy)
{
struct tp_touch *t;
double tdx, tdy;
unsigned int i;
tp_get_touches_delta(tp, dx, dy, false);
}
for (i = 0; i < tp->real_touches; i++) {
t = &tp->touches[i];
if (!tp_touch_active(tp, t) || !t->dirty)
continue;
tp_get_delta(t, &tdx, &tdy);
*dx += tdx;
*dy += tdy;
}
static inline void
tp_get_average_touches_delta(struct tp_dispatch *tp, double *dx, double *dy)
{
tp_get_touches_delta(tp, dx, dy, true);
}
static void