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

touchpad: use the tp_libinput_context() helper

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2016-06-09 11:05:12 +10:00
parent c781ef2eb3
commit 48d82ed3ea
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,7 @@ tp_get_average_touches_delta(struct tp_dispatch *tp)
static void
tp_gesture_start(struct tp_dispatch *tp, uint64_t time)
{
struct libinput *libinput = tp->device->base.seat->libinput;
struct libinput *libinput = tp_libinput_context(tp);
const struct normalized_coords zero = { 0.0, 0.0 };
if (tp->gesture.started)
@ -525,7 +525,7 @@ tp_gesture_stop_twofinger_scroll(struct tp_dispatch *tp, uint64_t time)
static void
tp_gesture_end(struct tp_dispatch *tp, uint64_t time, bool cancelled)
{
struct libinput *libinput = tp->device->base.seat->libinput;
struct libinput *libinput = tp_libinput_context(tp);
enum tp_gesture_state state = tp->gesture.state;
tp->gesture.state = GESTURE_STATE_NONE;
@ -628,7 +628,7 @@ tp_init_gesture(struct tp_dispatch *tp)
tp->gesture.state = GESTURE_STATE_NONE;
libinput_timer_init(&tp->gesture.finger_count_switch_timer,
tp->device->base.seat->libinput,
tp_libinput_context(tp),
tp_gesture_finger_count_switch_timeout, tp);
return 0;
}

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

@ -131,7 +131,7 @@ tp_fake_finger_count(struct tp_dispatch *tp)
* time */
if (__builtin_popcount(
tp->fake_touches & ~(FAKE_FINGER_OVERFLOW|0x1)) > 1)
log_bug_kernel(tp->device->base.seat->libinput,
log_bug_kernel(tp_libinput_context(tp),
"Invalid fake finger state %#x\n",
tp->fake_touches);