[PATCH libinput 4/3] touchpad: annotate all coordinates that are in device coordinates

Peter Hutterer peter.hutterer at who-t.net
Thu Mar 5 21:43:46 PST 2015


Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev-mt-touchpad.h | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 65581ae..8ea7d84 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -127,8 +127,8 @@ struct tp_touch {
 	enum touch_state state;
 	bool has_ended;				/* TRACKING_ID == -1 */
 	bool dirty;
-	int32_t x;
-	int32_t y;
+	int32_t x;				/* in device coordinates */
+	int32_t y;				/* in device coordinates */
 	uint64_t millis;
 
 	struct {
@@ -138,8 +138,8 @@ struct tp_touch {
 	} history;
 
 	struct {
-		int32_t center_x;
-		int32_t center_y;
+		int32_t center_x;		/* in device coordinates */
+		int32_t center_y;		/* in device coordinates */
 	} hysteresis;
 
 	/* A pinned touchpoint is the one that pressed the physical button
@@ -148,8 +148,8 @@ struct tp_touch {
 	 */
 	struct {
 		bool is_pinned;
-		int32_t center_x;
-		int32_t center_y;
+		int32_t center_x;		/* in device coordinates */
+		int32_t center_y;		/* in device coordinates */
 	} pinned;
 
 	/* Software-button state and timeout if applicable */
@@ -162,7 +162,7 @@ struct tp_touch {
 
 	struct {
 		enum tp_tap_touch_state state;
-		int32_t initial_x, initial_y;
+		int32_t initial_x, initial_y;	/* in device coordinates */
 	} tap;
 
 	struct {
@@ -175,7 +175,8 @@ struct tp_touch {
 
 	struct {
 		bool is_palm;
-		int32_t x, y;  /* first coordinates if is_palm == true */
+		int32_t x, y;  /* first coordinates if is_palm == true,
+				  in device coordinates */
 		uint32_t time; /* first timestamp if is_palm == true */
 	} palm;
 };
@@ -201,8 +202,8 @@ struct tp_dispatch {
 	unsigned int fake_touches;
 
 	struct {
-		int32_t margin_x;
-		int32_t margin_y;
+		int32_t margin_x;		/* in device coordiantes */
+		int32_t margin_y;		/* in device coordiantes */
 	} hysteresis;
 
 	struct {
@@ -233,14 +234,14 @@ struct tp_dispatch {
 		 * The buttons are split according to the edge settings.
 		 */
 		struct {
-			int32_t top_edge;
-			int32_t rightbutton_left_edge;
+			int32_t top_edge;	/* in device coordinates */
+			int32_t rightbutton_left_edge; /* in device coordinates */
 		} bottom_area;
 
 		struct {
-			int32_t bottom_edge;
-			int32_t rightbutton_left_edge;
-			int32_t leftbutton_right_edge;
+			int32_t bottom_edge;	/* in device coordinates */
+			int32_t rightbutton_left_edge; /* in device coordinates */
+			int32_t leftbutton_right_edge; /* in device coordinates */
 		} top_area;
 
 		struct evdev_device *trackpoint;
@@ -252,8 +253,8 @@ struct tp_dispatch {
 	struct {
 		struct libinput_device_config_scroll_method config_method;
 		enum libinput_config_scroll_method method;
-		int32_t right_edge;
-		int32_t bottom_edge;
+		int32_t right_edge;		/* in device coordinates */
+		int32_t bottom_edge;		/* in device coordinates */
 	} scroll;
 
 	enum touchpad_event queued;
@@ -268,8 +269,8 @@ struct tp_dispatch {
 	} tap;
 
 	struct {
-		int32_t right_edge;
-		int32_t left_edge;
+		int32_t right_edge;		/* in device coordinates */
+		int32_t left_edge;		/* in device coordinates */
 	} palm;
 
 	struct {
-- 
2.1.0



More information about the wayland-devel mailing list