From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 9 Dec 2014 11:47:09 +0000 (+0100)
Subject: touchpad: Add a tp_post_pointer_motion helper function
X-Git-Tag: 0.8.0~57
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=759e5eca6d45eb44ab47669795cac6dd95992480;p=platform%2Fupstream%2Flibinput.git

touchpad: Add a tp_post_pointer_motion helper function

Split out the pointer-motion handling into a helper function.

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>
---

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 32d6eaca..f6a8a899 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -586,32 +586,13 @@ tp_post_process_state(struct tp_dispatch *tp, uint64_t time)
 	tp->queued = TOUCHPAD_EVENT_NONE;
 }
 
-
 static void
-tp_post_events(struct tp_dispatch *tp, uint64_t time)
+tp_post_pointer_motion(struct tp_dispatch *tp, uint64_t time)
 {
 	struct tp_touch *t = tp_current_touch(tp);
 	double dx, dy;
-	int filter_motion = 0;
 	double dx_unaccel, dy_unaccel;
 
-	/* Only post (top) button events while suspended */
-	if (tp->device->suspended) {
-		tp_post_button_events(tp, time);
-		return;
-	}
-
-	filter_motion |= tp_tap_handle_state(tp, time);
-	filter_motion |= tp_post_button_events(tp, time);
-
-	if (filter_motion || tp->sendevents.trackpoint_active) {
-		tp_stop_scroll_events(tp, time);
-		return;
-	}
-
-	if (tp_post_scroll_events(tp, time) != 0)
-		return;
-
 	if (!t->is_pointer) {
 		tp_for_each_touch(tp, t) {
 			if (t->is_pointer)
@@ -633,6 +614,31 @@ tp_post_events(struct tp_dispatch *tp, uint64_t time)
 	}
 }
 
+static void
+tp_post_events(struct tp_dispatch *tp, uint64_t time)
+{
+	int filter_motion = 0;
+
+	/* Only post (top) button events while suspended */
+	if (tp->device->suspended) {
+		tp_post_button_events(tp, time);
+		return;
+	}
+
+	filter_motion |= tp_tap_handle_state(tp, time);
+	filter_motion |= tp_post_button_events(tp, time);
+
+	if (filter_motion || tp->sendevents.trackpoint_active) {
+		tp_stop_scroll_events(tp, time);
+		return;
+	}
+
+	if (tp_post_scroll_events(tp, time) != 0)
+		return;
+
+	tp_post_pointer_motion(tp, time);
+}
+
 static void
 tp_handle_state(struct tp_dispatch *tp,
 		uint64_t time)