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

touchpad: Protect tp_begin_touch and tp_end_touch against being called twice

Browse source 
They were already protected against being called twice between SYN_REPORT, but not
for being called twice before a SYN_REPORT arrives.

This allows simplifying tp_process_fake_touch a bit. Note while at it also
also flip the if condition in tp_process_fake_touch so that the if is
true when the finger is down, and remove the bogus t->state = TOUCH_NONE.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Hans de Goede 2014-07-18 11:06:36 +02:00 • committed by Peter Hutterer
parent 0915c2c51a
commit b64fb73ace
1 changed files with 21 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -128,23 +128,25 @@ tp_get_touch(struct tp_dispatch *tp, unsigned int slot)
}
static inline void
tp_begin_touch(struct tp_dispatch *tp, struct tp_touch *t)
tp_begin_touch(struct tp_dispatch *tp, struct tp_touch *t, uint64_t time)
{
if (t->state != TOUCH_UPDATE) {
tp_motion_history_reset(t);
t->dirty = true;
t->state = TOUCH_BEGIN;
t->pinned.is_pinned = false;
tp->nfingers_down++;
assert(tp->nfingers_down >= 1);
tp->queued |= TOUCHPAD_EVENT_MOTION;
}
if (t->state == TOUCH_BEGIN || t->state == TOUCH_UPDATE)
return;
tp_motion_history_reset(t);
t->dirty = true;
t->state = TOUCH_BEGIN;
t->pinned.is_pinned = false;
t->millis = time;
tp->nfingers_down++;
assert(tp->nfingers_down >= 1);
tp->queued |= TOUCHPAD_EVENT_MOTION;
}
static inline void
tp_end_touch(struct tp_dispatch *tp, struct tp_touch *t)
tp_end_touch(struct tp_dispatch *tp, struct tp_touch *t, uint64_t time)
{
if (t->state == TOUCH_NONE)
if (t->state == TOUCH_END || t->state == TOUCH_NONE)
return;
t->dirty = true;
@ -152,6 +154,7 @@ tp_end_touch(struct tp_dispatch *tp, struct tp_touch *t)
t->palm.is_palm = false;
t->state = TOUCH_END;
t->pinned.is_pinned = false;
t->millis = time;
assert(tp->nfingers_down >= 1);
tp->nfingers_down--;
tp->queued |= TOUCHPAD_EVENT_MOTION;
@ -206,11 +209,10 @@ tp_process_absolute(struct tp_dispatch *tp,
tp->slot = e->value;
break;
case ABS_MT_TRACKING_ID:
t->millis = time;
if (e->value != -1)
tp_begin_touch(tp, t);
tp_begin_touch(tp, t, time);
else
tp_end_touch(tp, t);
tp_end_touch(tp, t, time);
}
}
@ -268,18 +270,11 @@ tp_process_fake_touch(struct tp_dispatch *tp,
for (i = 0; i < tp->ntouches; i++) {
t = tp_get_touch(tp, i);
if (i >= nfake_touches) {
if (t->state != TOUCH_NONE) {
tp_end_touch(tp, t);
t->millis = time;
}
} else if (t->state != TOUCH_UPDATE &&
t->state != TOUCH_BEGIN) {
t->state = TOUCH_NONE;
tp_begin_touch(tp, t);
t->millis = time;
if (i < nfake_touches) {
tp_begin_touch(tp, t, time);
t->fake =true;
}
} else
tp_end_touch(tp, t, time);
}
assert(tp->nfingers_down == nfake_touches);