[PATCH libinput 04/12] touchpad: change motion history to typesafe coords

Peter Hutterer peter.hutterer at who-t.net
Thu Mar 12 01:36:35 PDT 2015


Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev-mt-touchpad.c | 2 +-
 src/evdev-mt-touchpad.h | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 8808850..ebe611f 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -46,7 +46,7 @@ tp_hysteresis(int in, int center, int margin)
 		return center + diff + margin;
 }
 
-static inline struct tp_motion *
+static inline struct device_coords *
 tp_motion_history_offset(struct tp_touch *t, int offset)
 {
 	int offset_index =
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index aa6de69..ec8c8b1 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -122,11 +122,6 @@ enum tp_edge_scroll_touch_state {
 	EDGE_SCROLL_TOUCH_STATE_AREA,
 };
 
-struct tp_motion {
-	int32_t x;
-	int32_t y;
-};
-
 struct tp_touch {
 	struct tp_dispatch *tp;
 	enum touch_state state;
@@ -137,7 +132,7 @@ struct tp_touch {
 	uint64_t millis;
 
 	struct {
-		struct tp_motion samples[TOUCHPAD_HISTORY_LENGTH];
+		struct device_coords samples[TOUCHPAD_HISTORY_LENGTH];
 		unsigned int index;
 		unsigned int count;
 	} history;
-- 
2.1.0



More information about the wayland-devel mailing list