Add contact information to the property list

Add the five first contacts to the property list, and unify the
handling of all gesture types in this regard. To avoid duplication,
move the scaling of properties closer to the gesture recognizer.
Move all gesture event handling code to grail-event.c, simplifying
the structure somewhat.

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

1 files changed, 93 insertions, 0 deletions

diff --git a/src/grail-event.c b/src/grail-event.c
index 6479cc0..2cf8209 100644
--- a/src/grail-event.c
+++ b/src/grail-event.c
@@ -22,8 +22,101 @@
 
 #include "grail-inserter.h"
 #include "grail-impl.h"
+#include <malloc.h>
+#include <string.h>
+#include <errno.h>
 #include <math.h>
 
+static void compute_bbox(struct grail_coord *min, struct grail_coord *max,
+                         const struct touch_frame *frame)
+{
+        float x, y;
+        int i;
+        if (frame->nactive < 1)
+                return;
+        x = frame->active[0]->x;
+        y = frame->active[0]->y;
+        min->x = max->x = x;
+        min->y = max->y = y;
+        for (i = 1; i < frame->nactive; i++) {
+                x = frame->active[i]->x;
+                y = frame->active[i]->y;
+                if (x < min->x)
+                        min->x = x;
+                if (y < min->y)
+                        min->y = y;
+                if (x > max->x)
+                        max->x = x;
+                if (y > max->y)
+                        max->y = y;
+        }
+}
+
+int gin_add_contact_props(const struct gesture_inserter *gin,
+                          grail_prop_t *prop, const struct touch_frame *frame)
+{
+        struct grail_coord min, max;
+        int i, n = 0, ntouch = frame->nactive;
+        if (!ntouch)
+                return n;
+        if (ntouch > 5)
+                ntouch = 5;
+        compute_bbox(&min, &max, frame);
+        prop[n++] = gin_prop_x(gin, min.x);
+        prop[n++] = gin_prop_y(gin, min.y);
+        prop[n++] = gin_prop_x(gin, max.x);
+        prop[n++] = gin_prop_y(gin, max.y);
+        for (i = 0; i < ntouch; i++) {
+                const struct touch *ct = frame->active[i];
+                prop[n++] = ct->id;
+                prop[n++] = gin_prop_x(gin, ct->x);
+                prop[n++] = gin_prop_y(gin, ct->y);
+        }
+        return n;
+}
+
+int gin_get_clients(struct grail *ge,
+                    struct grail_client_info *info, int maxinfo,
+                    const grail_mask_t* types, int btypes,
+                    const grail_mask_t* span, int bspan,
+                    const struct touch_frame *frame)
+{
+        struct grail_coord pos[DIM_TOUCH];
+        int i, npos = 0;
+        if (!ge->get_clients)
+                return 0;
+        grail_mask_foreach(i, span, bspan) {
+                pos[npos].x = gin_prop_x(ge->gin, frame->touch[i].x);
+                pos[npos].y = gin_prop_y(ge->gin, frame->touch[i].y);
+                npos++;
+        }
+        return ge->get_clients(ge, info, maxinfo, pos, npos, types, btypes);
+}
+
+void gin_send_event(struct grail *ge, struct slot_state *s,
+                    const struct gesture_event *ev,
+                    const struct touch_frame *frame)
+{
+        const struct gesture_inserter *gin = ge->gin;
+        struct grail_event gev;
+        int i;
+        if (!ge->gesture)
+                return;
+        gev.type = s->type;
+        gev.id = s->id;
+        gev.status = ev->status;
+        gev.ntouch = ev->ntouch;
+        gev.nprop = ev->nprop;
+        gev.time = ev->time;
+        gev.pos.x = gin_prop_x(gin, ev->pos.x);
+        gev.pos.y = gin_prop_y(gin, ev->pos.y);
+        memcpy(gev.prop, ev->prop, ev->nprop * sizeof(grail_prop_t));
+        for (i = 0; i < s->nclient; i++) {
+                gev.client_id = s->client_id[i];
+                ge->gesture(ge, &gev);
+        }
+}
+
 int grail_get_contacts(const struct grail *ge,
                        struct grail_contact *touch, int max_touch)
 {