Make sure contact area is always defined

Some devices do not always send touch_minor after touch_major
has been set. According to the MT protocol, this case should
be treated as if minor is equal to major. This patch makes sure
touch_minor is never zero when touch_major is set.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

1 files changed, 6 insertions, 0 deletions

diff --git a/src/touch-dev.c b/src/touch-dev.c
index 287076a..17082ed 100644
--- a/src/touch-dev.c
+++ b/src/touch-dev.c
@@ -25,6 +25,9 @@
 #include <string.h>
 #include <errno.h>
 
+/* see mtdev-mapping.h */
+#define MTDEV_TOUCH_MINOR       1
+
 #define SET_PROP(name, value)                                           \
         if (t->name != value) {                                         \
                 t->name = value;                                        \
@@ -34,6 +37,9 @@
 static void finish_touch(struct touch_dev *dev, struct touch_frame *frame)
 {
         struct touch *t = &frame->touch[dev->slot];
+        if (t->touch_major && !t->touch_minor ||
+            !dev->mtdev.caps.has_abs[MTDEV_TOUCH_MINOR])
+                SET_PROP(touch_minor, t->touch_major);
         if (dev->state > 0) {
                 t->active = 1;
                 grail_mask_set(frame->touches, dev->slot);