Make use of the key mask in struct evdev_device to keep track of pressed
buttons.
Signed-off-by: Jonas Ådahl <jad...@gmail.com>
---
src/evdev-mt-touchpad-buttons.c | 24 ++++++++++++------------
src/evdev-mt-touchpad-tap.c | 8 ++++----
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/evdev-mt-touchpad-buttons.c b/src/evdev-mt-touchpad-buttons.c
index 520a47f..308a3be 100644
--- a/src/evdev-mt-touchpad-buttons.c
+++ b/src/evdev-mt-touchpad-buttons.c
@@ -607,10 +607,10 @@ tp_post_clickfinger_buttons(struct tp_dispatch *tp,
uint64_t time)
}
if (button)
- pointer_notify_button(&tp->device->base,
- time,
- button,
- state);
+ evdev_pointer_notify_button(tp->device,
+ time,
+ button,
+ state);
return 1;
}
@@ -632,10 +632,10 @@ tp_post_physical_buttons(struct tp_dispatch *tp, uint64_t
time)
else
state = LIBINPUT_BUTTON_STATE_RELEASED;
- pointer_notify_button(&tp->device->base,
- time,
- button,
- state);
+ evdev_pointer_notify_button(tp->device,
+ time,
+ button,
+ state);
}
button++;
@@ -708,10 +708,10 @@ tp_post_softbutton_buttons(struct tp_dispatch *tp,
uint64_t time)
tp->buttons.click_pending = false;
if (button)
- pointer_notify_button(&tp->device->base,
- time,
- button,
- state);
+ evdev_pointer_notify_button(tp->device,
+ time,
+ button,
+ state);
return 1;
}
diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
index 0f1f837..3d99e0f 100644
--- a/src/evdev-mt-touchpad-tap.c
+++ b/src/evdev-mt-touchpad-tap.c
@@ -113,10 +113,10 @@ tp_tap_notify(struct tp_dispatch *tp,
return;
}
- pointer_notify_button(&tp->device->base,
- time,
- button,
- state);
+ evdev_pointer_notify_button(tp->device,
+ time,
+ button,
+ state);
}
static void
--
1.8.5.1
_______________________________________________
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
