Merge lp:~oif-team/grail/trunk.v1.0.17 into lp:grail

[Henrik Rydberg]

Alright, last trim patch before starting the real work for natty. No SRU or anything.

[Henrik Rydberg (rydberg)]

The patch is a month old, and looking through it, I see things might turn up a bit differently a couple of weeks from now... So, either way is fine.

[Chase Douglas (chasedouglas)]

I don't have any problems with this, but I also think this won't go into Maverick and Natty grail will not need to deal with pointer emulation. I'll approve it and leave the decision up to you.

review: Approve

[Duncan McGreggor (oubiwann)]

On Wed, Nov 17, 2010 at 9:37 AM, Henrik Rydberg <email address hidden> wrote:
> The patch is a month old

Wow, kinda uncool that you never got a response back on it :-( If you
run into this again, be sure to ping someone. Or ping me: I'll sick
someone on the review :-)

[Henrik Rydberg (rydberg)]

Thanks - I actually did get response back then, and we decided to leave it for later, and for natty only. That's where we are now. :-)

=== modified file 'configure.ac'
--- configure.ac	2010-11-08 19:46:42 +0000
+++ configure.ac	2010-11-17 16:34:51 +0000
@@ -1,7 +1,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([Gesture Recognition And Instantiation Library],
-        [1.0.16],
+        [1.0.17],
         [],
         [utouch-grail])
 AC_CONFIG_SRCDIR([Makefile.am])
 
=== modified file 'src/grail-api.c'
--- src/grail-api.c	2010-10-28 14:02:38 +0000
+++ src/grail-api.c	2010-11-17 16:34:51 +0000
@@ -36,10 +36,6 @@
 	struct grail *ge = dev->priv;
 	struct grail_impl *x = ge->impl;
 	if (ev->type == EV_ABS) {
-		if (ev->code == ABS_X)
-			x->pointer_x = ev->value;
-		if (ev->code == ABS_Y)
-			x->pointer_y = ev->value;
 		return;
 	}
 	if (ev->type == EV_KEY) {
@@ -80,6 +76,60 @@
 	impl->report_status = 0;
 }
 
+#define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
+
+static int getabs(struct input_absinfo *abs, int key, int fd)
+{
+	int rc;
+	SYSCALL(rc = ioctl(fd, EVIOCGABS(key), abs));
+	return rc >= 0;
+}
+
+static void set_emulation_caps(struct grail_impl *impl, int fd)
+{
+	struct touch_caps *emu = &impl->emu;
+	struct input_absinfo info;
+
+	memset(emu, 0, sizeof(*emu));
+
+	if (getabs(&info, ABS_X, fd)) {
+		emu->min_x = info.minimum;
+		emu->max_x = info.maximum;
+	}
+	if (getabs(&info, ABS_Y, fd)) {
+		emu->min_y = info.minimum;
+		emu->max_y = info.maximum;
+	}
+}
+
+static void set_pointer(struct grail_impl *impl)
+{
+	struct touch_dev *dev = &impl->dev;
+	struct touch_caps *caps = &dev->caps;
+	struct touch_caps *emu = &impl->emu;
+	struct touch_frame *frame = &dev->frame;
+	int best_x, best_y, best_d = -1;
+	int i;
+
+	for (i = 0; i < frame->nactive; i++) {
+		struct touch *t = frame->active[i];
+		float u = (t->x - caps->min_x) / (caps->max_x - caps->min_x);
+		float v = (t->y - caps->min_y) / (caps->max_y - caps->min_y);
+		int x = emu->min_x + u * (emu->max_x - emu->min_x);
+		int y = emu->min_y + v * (emu->max_y - emu->min_y);
+		int d = abs(x - impl->pointer_x) + abs(y - impl->pointer_y);
+		if (best_d < 0 || d < best_d) {
+			best_x = x;
+			best_y = y;
+			best_d = d;
+		}
+	}
+	if (best_d >= 0) {
+		impl->pointer_x = best_x;
+		impl->pointer_y = best_y;
+	}
+}
+
 static void handle_abs_events(struct grail *ge, const struct input_event *syn)
 {
 	static const int fm_mask = 0x03;
@@ -95,6 +145,7 @@
 	int ishold = pointer && tap->active && !used_move;
 	int istap = gru->tapping.tap == 1 && !used_tap;
 
+	set_pointer(impl);
 	if (!impl->pointer_status && pointer) {
 		impl->report_x = impl->pointer_x;
 		impl->report_y = impl->pointer_y;
@@ -175,6 +226,7 @@
 	ret = touch_dev_open(&x->dev, fd);
 	if (ret)
 		goto freemem;
+	set_emulation_caps(x, fd);
 	x->dev.event = tp_event;
 	x->dev.sync = tp_sync;
 	x->dev.priv = ge;
 
=== modified file 'src/grail-impl.h'
--- src/grail-impl.h	2010-09-21 11:25:43 +0000
+++ src/grail-impl.h	2010-11-17 16:34:51 +0000
@@ -28,6 +28,7 @@
 
 struct grail_impl {
 	struct touch_dev dev;
+	struct touch_caps emu;
 	struct evbuf evbuf;
 	int filter_abs;
 	int pointer_status;