Merge lp:~tkluck/frame/coordinate-transform into lp:frame

[Timo Kluck]

Add support for coordinate transform

[Chase Douglas (chasedouglas)]

The code looks reasonable. I don't think there's anything else that would go into a 1.2.x api extension, so please add a commit to bump the version to 1.2.0 and tag it as v1.2.0.

Normally we ask for two utouch team members to approve of a change before merging, so I'm going to subscribe the team.

review: Approve

[Timo Kluck (tkluck)]

Thanks for your approval! I just bumped the version.

[lp:~tkluck/frame/coordinate-transform]

43. By Timo Kluck on 2011-08-31

Bump version (note API extension)

[Jussi Pakkanen (jpakkane)]

Looks good. As I'm not an autotools expert I'm not sure what this does:

-LIB_VERSION=2:0:1
+LIB_VERSION=3:0:2

Does this bump library soname or something similar? It should not, because this is an API extension.

[Stephen M. Webb (bregma)]

Looks correct.

The LIB_VERSION bump is the right way to handle backwards-compatible API extensions. The SONAME remains unchanged but the minor version of the library filename will be bumped by one.

review: Approve

[Chase Douglas (chasedouglas)]

I realized it didn't make sense to push the branch with the tag since it hasn't been runtime tested much. The branch will build in the ppa:utouch-team/daily archive. After some testing we can release a new upstream version.

[Chase Douglas (chasedouglas)]

Good thing I didn't tag it because I just noticed an issue: the library version script should have been extended with a new version block instead of having the current block upgraded. I have fixed this in commit 43.

=== modified file 'configure.ac'
--- configure.ac	2011-08-09 21:29:54 +0000
+++ configure.ac	2011-08-31 13:19:06 +0000
@@ -1,7 +1,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([Touch Frame Library],
-        [1.1.4],
+        [1.2.0],
         [],
         [utouch-frame])
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -13,7 +13,7 @@
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
 
-LIB_VERSION=2:0:1
+LIB_VERSION=3:0:2
 AC_SUBST([LIB_VERSION])
 
 # Initialize libtool

=== modified file 'include/utouch/frame.h'
--- include/utouch/frame.h	2011-05-17 14:09:11 +0000
+++ include/utouch/frame.h	2011-08-31 13:19:06 +0000
@@ -300,6 +300,25 @@
 const struct utouch_frame *utouch_frame_sync(utouch_frame_handle fh,
 					     utouch_frame_time_t time);
 
+/**
+ * utouch_coordinate_transform_cb - user-definable callback that transforms a touch point
+ * @x: pointer to an x coordinate (in, out)
+ * @y: pointer to a y coordinate (in, out)
+ * @user_data: opaque pointer, passed by the user when setting the callback
+ */
+typedef void (*utouch_coordinate_transform_cb)(float *x, float *y, void *user_data);
+
+/**
+ * utouch_frame_set_coordinate_transform_callback - set a callback to obtain a transformation
+ *   to apply to every touch point
+ * @fh: the frame engine in use
+ * @callback: the callback that transforms x and y
+ * @user_data: opaque pointer to user data for the callback
+ */
+void utouch_frame_set_coordinate_transform_callback(utouch_frame_handle fh,
+						    utouch_coordinate_transform_cb callback,
+						    void *user_data);
+
 #ifdef __cplusplus
 }
 #endif

=== modified file 'src/frame-impl.h'
--- src/frame-impl.h	2011-05-17 14:09:11 +0000
+++ src/frame-impl.h	2011-08-31 13:19:06 +0000
@@ -36,6 +36,8 @@
 	int *evmap;
 	float map[9];
 	unsigned int semi_mt_num_active;
+	utouch_coordinate_transform_cb coordinate_transform;
+	void *coordinate_transform_user_data;
 };
 
 #endif

=== modified file 'src/frame.c'
--- src/frame.c	2011-08-09 19:22:39 +0000
+++ src/frame.c	2011-08-31 13:19:06 +0000
@@ -236,14 +236,19 @@
 	return -ENOMEM;
 }
 
-static void transform_slot(struct utouch_contact *slot,
-			   const struct utouch_surface *s)
+static void transform_slot(utouch_frame_handle fh,
+			   struct utouch_contact *slot)
 {
+	const struct utouch_surface *s = fh->surface;
 	float fx = (s->mapped_max_x - s->mapped_min_x) / (s->max_x - s->min_x);
 	float fy = (s->mapped_max_y - s->mapped_min_y) / (s->max_y - s->min_y);
 	/* assume clipped view for asymmetrical scaling */
 	float f = MAX(fx, fy);
 
+	if(fh->coordinate_transform) {
+		fh->coordinate_transform(&slot->x, &slot->y, fh->coordinate_transform_user_data);
+	}
+
 	slot->x = fx * (slot->x - s->min_x) + s->mapped_min_x;
 	slot->y = fy * (slot->y - s->min_y) + s->mapped_min_y;
 	slot->touch_major *= f;
@@ -279,7 +284,7 @@
 	a->pressure = b->pressure;
 	a->distance = b->distance;
 
-	transform_slot(a, s);
+	transform_slot(fh, a);
 
 	if (a->active && ap->active && a->id == ap->id) {
 		a->x += b->vx * dt;
@@ -406,3 +411,11 @@
 
 	return frame;
 }
+
+void utouch_frame_set_coordinate_transform_callback(utouch_frame_handle fh,
+						    utouch_coordinate_transform_cb callback,
+						    void *user_data)
+{
+	fh->coordinate_transform = callback;
+	fh->coordinate_transform_user_data = user_data;
+}

=== modified file 'src/libutouch-frame.ver'
--- src/libutouch-frame.ver	2011-06-14 13:27:45 +0000
+++ src/libutouch-frame.ver	2011-08-31 13:19:06 +0000
@@ -1,4 +1,4 @@
-UTOUCH_FRAME_1.1 {
+UTOUCH_FRAME_1.2 {
   global:
     utouch_frame_configure_xi2;
     utouch_frame_delete_engine;
@@ -14,6 +14,7 @@
     utouch_frame_new_engine_raw;
     utouch_frame_pump_mtdev;
     utouch_frame_pump_xi2;
+    utouch_frame_set_coordinate_transform_callback;
 
   local:
     *;