Merge lp:~peter-hutterer/evemu/misc-fixes into lp:evemu

[Peter Hutterer]

Fix for running on kernels before the propbit introduction.
The second one is important for e.g. mtview to see the first touch (until the slot id change) but will require a version bump for applications to make use of it

[lp:~peter-hutterer/evemu/misc-fixes]

54. By Peter Hutterer on 2012-06-05

Add evemu_get_abs_current() to retrieve the current value

Applications that use evemu need this for ABS_MT_SLOT so they can start working
on the first touchpoint, rather than waiting for the slot to change.

[Chase Douglas (chasedouglas)]

Both changes look good to me.

review: Approve

[Chase Douglas (chasedouglas)]

I noticed that the new function was placed in the UTOUCH_EVEMU_1.0 libtool version script block. I've created a new UTOUCH_EVEMU_1.1 block and moved the function into it instead. Any new functions before the next release will be added here.

=== modified file 'include/evemu.h'
--- include/evemu.h	2012-03-23 15:38:02 +0000
+++ include/evemu.h	2012-06-05 01:40:26 +0000
@@ -192,6 +192,16 @@
 int evemu_get_abs_maximum(const struct evemu_device *dev, int code);
 
 /**
+ * evemu_get_abs_current() - get kernel current value of event type
+ * @dev: the device in use
+ * @code: the event type code to query
+ *
+ * Returns the current value of the specified event type.
+ */
+int evemu_get_abs_current_value(const struct evemu_device *dev, int code);
+
+
+/**
  * evemu_set_abs_maximum() - set kernel maximum value of event type
  *
  * @dev: the device in use

=== modified file 'src/evemu.c'
--- src/evemu.c	2012-03-23 15:38:02 +0000
+++ src/evemu.c	2012-06-05 01:40:26 +0000
@@ -163,6 +163,11 @@
 	return dev->abs[code].maximum;
 }
 
+int evemu_get_abs_current_value(const struct evemu_device *dev, int code)
+{
+	return dev->abs[code].value;
+}
+
 void evemu_set_abs_maximum(struct evemu_device *dev, int code, int max)
 {
 	dev->abs[code].maximum = max;
@@ -490,12 +495,19 @@
 {
 	int bits = 8 * dev->pbytes;
 	int ret, i;
+	int success = 0;
 	for (i = 0; i < bits; i++) {
 		if (!evemu_has_prop(dev, i))
 			continue;
 		ret = set_prop_bit(fd, i);
-		if (ret < 0)
-			return ret;
+		/* Older kernels aways return errors on UI_SET_PROPBIT.
+		   Assume that if we only get failures, it may be an older
+		   kernel and report success anyway. */
+		if (ret < 0) {
+			if (success)
+				return ret;
+		} else if (!success)
+			success = 1;
 	}
 	return 0;
 }

=== modified file 'src/libutouch-evemu.ver'
--- src/libutouch-evemu.ver	2011-06-17 01:54:02 +0000
+++ src/libutouch-evemu.ver	2012-06-05 01:40:26 +0000
@@ -8,6 +8,7 @@
     evemu_get_abs_fuzz;
     evemu_get_abs_maximum;
     evemu_get_abs_minimum;
+    evemu_get_abs_current_value;
     evemu_get_abs_resolution;
     evemu_get_id_bustype;
     evemu_get_id_product;