Instead of reimplementing a for loop every time.
Signed-off-by: Marcos Paulo de Souza <[email protected]>
---
Hi guys, this is my first patch to libinput, so please let me know if I forgot
someting.
Thanks!
src/evdev-mt-touchpad-gestures.c | 5 ++---
src/evdev-mt-touchpad.c | 12 +++---------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/evdev-mt-touchpad-gestures.c b/src/evdev-mt-touchpad-gestures.c
index 3de6bcd..a20b26d 100644
--- a/src/evdev-mt-touchpad-gestures.c
+++ b/src/evdev-mt-touchpad-gestures.c
@@ -153,13 +153,12 @@ tp_gesture_get_active_touches(const struct tp_dispatch
*tp,
struct tp_touch **touches,
unsigned int count)
{
- unsigned int i, n = 0;
+ unsigned int n = 0;
struct tp_touch *t;
memset(touches, 0, count * sizeof(struct tp_touch *));
- for (i = 0; i < tp->ntouches; i++) {
- t = &tp->touches[i];
+ tp_for_each_touch(tp, t) {
if (tp_touch_active(tp, t)) {
touches[n++] = t;
if (n == count)
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index eb950a2..bceb591 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -845,8 +845,7 @@ tp_unhover_pressure(struct tp_dispatch *tp, uint64_t time)
* _all_ fingers have enough pressure, even if some of the slotted
* ones don't. Anything else gets insane quickly.
*/
- for (i = 0; i < (int)tp->ntouches; i++) {
- t = tp_get_touch(tp, i);
+ tp_for_each_touch(tp, t) {
if (t->state == TOUCH_HOVERING) {
/* avoid jumps when landing a finger */
tp_motion_history_reset(t);
@@ -900,9 +899,7 @@ tp_unhover_fake_touches(struct tp_dispatch *tp, uint64_t
time)
*/
if (tp_fake_finger_is_touching(tp) &&
tp->nfingers_down < nfake_touches) {
- for (i = 0; i < (int)tp->ntouches; i++) {
- t = tp_get_touch(tp, i);
-
+ tp_for_each_touch(tp, t) {
if (t->state == TOUCH_HOVERING) {
tp_begin_touch(tp, t, time);
@@ -1060,7 +1057,6 @@ static void
tp_process_state(struct tp_dispatch *tp, uint64_t time)
{
struct tp_touch *t;
- unsigned int i;
bool restart_filter = false;
bool want_motion_reset;
@@ -1070,9 +1066,7 @@ tp_process_state(struct tp_dispatch *tp, uint64_t time)
want_motion_reset = tp_need_motion_history_reset(tp);
- for (i = 0; i < tp->ntouches; i++) {
- t = tp_get_touch(tp, i);
-
+ tp_for_each_touch(tp, t) {
if (want_motion_reset) {
tp_motion_history_reset(t);
t->quirks.reset_motion_history = true;
--
2.9.3
_______________________________________________
wayland-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/wayland-devel
