Commit 04089257 authored by Peter Hutterer's avatar Peter Hutterer

test: re-use code in litest_touch_move_to()

We can use the _extended version here. And it turns out the behavior was
slightly different, with the _extended version doing one step too few.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent e640bac8
...@@ -1994,17 +1994,11 @@ litest_touch_move_to(struct litest_device *d, ...@@ -1994,17 +1994,11 @@ litest_touch_move_to(struct litest_device *d,
double x_to, double y_to, double x_to, double y_to,
int steps, int sleep_ms) int steps, int sleep_ms)
{ {
for (int i = 1; i < steps; i++) { litest_touch_move_to_extended(d, slot,
litest_touch_move(d, slot, x_from, y_from,
x_from + (x_to - x_from)/steps * i, x_to, y_to,
y_from + (y_to - y_from)/steps * i); NULL,
if (sleep_ms) { steps, sleep_ms);
libinput_dispatch(d->libinput);
msleep(sleep_ms);
libinput_dispatch(d->libinput);
}
}
litest_touch_move(d, slot, x_to, y_to);
} }
void void
...@@ -2015,7 +2009,7 @@ litest_touch_move_to_extended(struct litest_device *d, ...@@ -2015,7 +2009,7 @@ litest_touch_move_to_extended(struct litest_device *d,
struct axis_replacement *axes, struct axis_replacement *axes,
int steps, int sleep_ms) int steps, int sleep_ms)
{ {
for (int i = 1; i < steps - 1; i++) { for (int i = 1; i < steps; i++) {
litest_touch_move_extended(d, slot, litest_touch_move_extended(d, slot,
x_from + (x_to - x_from)/steps * i, x_from + (x_to - x_from)/steps * i,
y_from + (y_to - y_from)/steps * i, y_from + (y_to - y_from)/steps * i,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment