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

[Henrik Rydberg]

This is a proposed bugfix for LP 647761. The idea is simply to not use grail for any device with relative axes. This includes the magic mouse, but any other devices you could think of that would be affected by this change?

[lp:~oif-team/grail/trunk.v1.0.15]

97. By Henrik Rydberg on 2010-09-28

Only support pure absolute devices at this time

There are some hybrid relative/absolute devices out there, like
the magic mouse, for which special behavior, outside the current
scope of grail, is expected. This patch disables grail for those
devices.

98. By Henrik Rydberg on 2010-09-28

grail v1.0.15

Unmerged revisions

=== modified file 'configure.ac'
--- configure.ac	2010-09-21 11:27:20 +0000
+++ configure.ac	2010-09-28 09:35:51 +0000
@@ -1,7 +1,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([Gesture Recognition And Instantiation Library],
-        [1.0.14],
+        [1.0.15],
         [],
         [utouch-grail])
 AC_CONFIG_SRCDIR([Makefile.am])

=== modified file 'src/touch-caps.c'
--- src/touch-caps.c	2010-09-10 12:00:27 +0000
+++ src/touch-caps.c	2010-09-28 09:35:51 +0000
@@ -48,18 +48,26 @@
 {
 	unsigned long keybits[nlongs(KEY_MAX)];
 	unsigned long absbits[nlongs(ABS_MAX)];
+	unsigned long relbits[nlongs(REL_CNT)];
 	int rc;
 
+	SYSCALL(rc = ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits));
+	if (rc < 0)
+		return 0;
+	SYSCALL(rc = ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbits)), absbits));
+	if (rc < 0)
+		return 0;
+	SYSCALL(rc = ioctl(fd, EVIOCGBIT(EV_REL, sizeof(relbits)), relbits));
+	if (rc < 0)
+		return 0;
+
+	/* only support pure absolute devices at this time */
+	if (getbit(relbits, REL_X) || getbit(relbits, REL_Y))
+		return 0;
+
 	if (dev->mtdev.caps.has_mtdata)
 		return 1;
 
-	SYSCALL(rc = ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits));
-	if (rc < 0)
-		return 0;
-	SYSCALL(rc = ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absbits)), absbits));
-	if (rc < 0)
-		return 0;
-
 	return getbit(absbits, ABS_X) &&
 		getbit(absbits, ABS_Y) &&
 		getbit(keybits, BTN_TOUCH) &&