3 files changed, 121 insertions, 0 deletions

diff --git a/include/grail.h b/include/grail.h
index 241800e..c77a6e3 100644
--- a/include/grail.h
+++ b/include/grail.h
@@ -86,6 +86,10 @@ int grail_idle(struct grail *ge, int fd, int ms);
 int grail_pull(struct grail *ge, int fd);
 void grail_close(struct grail *ge, int fd);
 
+void grail_set_bbox(struct grail *ge,
+                    const struct grail_coord *min,
+                    const struct grail_coord *max);
+
 void grail_get_units(const struct grail *ge,
                      struct grail_coord *min, struct grail_coord *max);
 
diff --git a/src/grail-inserter.c b/src/grail-inserter.c
index d982808..8b0296e 100644
--- a/src/grail-inserter.c
+++ b/src/grail-inserter.c
@@ -24,6 +24,7 @@
 #include <malloc.h>
 #include <string.h>
 #include <errno.h>
+#include <math.h>
 
 static const int MAX_GESTURE_ID = 0xfff;
 
@@ -34,8 +35,99 @@ struct gesture_inserter {
         grail_mask_t used[DIM_INSTANCE_BYTES];
         grail_time_t time;
         int gestureid;
+        int transformed;
+        float scale_x, scale_y, scale_r;
+        float trans_x, trans_y;
 };
 
+static const int grail_main_type[DIM_GRAIL_TYPE] = {
+        GRAIL_MAIN_DRAG,
+        GRAIL_MAIN_PINCH,
+        GRAIL_MAIN_ROTATE,
+        GRAIL_MAIN_DRAG,
+        GRAIL_MAIN_PINCH,
+        GRAIL_MAIN_ROTATE,
+        GRAIL_MAIN_DRAG,
+        GRAIL_MAIN_PINCH,
+        GRAIL_MAIN_ROTATE,
+        GRAIL_MAIN_DRAG,
+        GRAIL_MAIN_PINCH,
+        GRAIL_MAIN_ROTATE,
+        GRAIL_MAIN_DRAG,
+        GRAIL_MAIN_PINCH,
+        GRAIL_MAIN_ROTATE,
+        GRAIL_MAIN_TAP,
+        GRAIL_MAIN_TAP,
+        GRAIL_MAIN_TAP,
+        GRAIL_MAIN_TAP,
+        GRAIL_MAIN_TAP,
+        GRAIL_MAIN_DRAG,
+        GRAIL_MAIN_PINCH,
+        GRAIL_MAIN_ROTATE,
+        GRAIL_MAIN_DRAG,
+        GRAIL_MAIN_PINCH,
+        GRAIL_MAIN_ROTATE,
+};
+
+static void transform_pos(const struct gesture_inserter *gin,
+                          struct grail_coord *pos)
+{
+        if (gin->transformed) {
+                pos->x *= gin->scale_x;
+                pos->x += gin->trans_x;
+                pos->y *= gin->scale_y;
+                pos->y += gin->trans_y;
+        }
+}
+
+static void transform_prop(const struct gesture_inserter *gin, int type,
+                           grail_prop_t *prop, int nprop)
+{
+        if (!gin->transformed)
+                return;
+        switch (grail_main_type[type]) {
+        case GRAIL_MAIN_DRAG:
+                prop[GRAIL_PROP_DRAG_DX] *= gin->scale_x;
+                prop[GRAIL_PROP_DRAG_DY] *= gin->scale_y;
+                prop[GRAIL_PROP_DRAG_VX] *= gin->scale_x;
+                prop[GRAIL_PROP_DRAG_VY] *= gin->scale_y;
+                prop[GRAIL_PROP_DRAG_X] *= gin->scale_x;
+                prop[GRAIL_PROP_DRAG_X] += gin->trans_x;
+                prop[GRAIL_PROP_DRAG_Y] *= gin->scale_y;
+                prop[GRAIL_PROP_DRAG_Y] += gin->trans_y;
+                break;
+        case GRAIL_MAIN_PINCH:
+                prop[GRAIL_PROP_PINCH_DR] *= gin->scale_r;
+                prop[GRAIL_PROP_PINCH_VR] *= gin->scale_r;
+                prop[GRAIL_PROP_PINCH_R] *= gin->scale_r;
+                prop[GRAIL_PROP_PINCH_X1] *= gin->scale_x;
+                prop[GRAIL_PROP_PINCH_X1] += gin->trans_x;
+                prop[GRAIL_PROP_PINCH_Y1] *= gin->scale_y;
+                prop[GRAIL_PROP_PINCH_Y1] += gin->trans_y;
+                prop[GRAIL_PROP_PINCH_X2] *= gin->scale_x;
+                prop[GRAIL_PROP_PINCH_X2] += gin->trans_x;
+                prop[GRAIL_PROP_PINCH_Y2] *= gin->scale_y;
+                prop[GRAIL_PROP_PINCH_Y2] += gin->trans_y;
+                break;
+        case GRAIL_MAIN_ROTATE:
+                prop[GRAIL_PROP_ROTATE_X1] *= gin->scale_x;
+                prop[GRAIL_PROP_ROTATE_X1] += gin->trans_x;
+                prop[GRAIL_PROP_ROTATE_Y1] *= gin->scale_y;
+                prop[GRAIL_PROP_ROTATE_Y1] += gin->trans_y;
+                prop[GRAIL_PROP_ROTATE_X2] *= gin->scale_x;
+                prop[GRAIL_PROP_ROTATE_X2] += gin->trans_x;
+                prop[GRAIL_PROP_ROTATE_Y2] *= gin->scale_y;
+                prop[GRAIL_PROP_ROTATE_Y2] += gin->trans_y;
+                break;
+        case GRAIL_MAIN_TAP:
+                prop[GRAIL_PROP_TAP_X] *= gin->scale_x;
+                prop[GRAIL_PROP_TAP_X] += gin->trans_x;
+                prop[GRAIL_PROP_TAP_Y] *= gin->scale_y;
+                prop[GRAIL_PROP_TAP_Y] += gin->trans_y;
+                break;
+        };
+}
+
 static int find_gslot(const struct gesture_inserter *gin, int gid)
 {
         int i;
@@ -59,7 +151,9 @@ static void send_event(struct grail *ge, struct slot_state *s,
         gev.nprop = ev->nprop;
         gev.time = ev->time;
         gev.pos = ev->pos;
+        transform_pos(ge->gin, &gev.pos);
         memcpy(gev.prop, ev->prop, ev->nprop * sizeof(grail_prop_t));
+        transform_prop(ge->gin, gev.type, gev.prop, gev.nprop);
         for (i = 0; i < s->nclient; i++) {
                 gev.client_id = s->client_id[i];
                 ge->gesture(ge, &gev);
@@ -95,6 +189,7 @@ static void setup_new_gestures(struct grail *ge,
                         const struct touch *t = &frame->touch[i];
                         coord[ncoord].x = t->prop[TP_POS_X];
                         coord[ncoord].y = t->prop[TP_POS_Y];
+                        transform_pos(gin, &coord[ncoord]);
                         ncoord++;
                 }
                 nclient = ge->get_clients(ge, info, DIM_CLIENT,
@@ -284,3 +379,21 @@ void gin_gid_end(struct grail *ge, int gid,
         }
         s->status = GRAIL_STATUS_END;
 }
+
+void grail_set_bbox(struct grail *ge,
+                    const struct grail_coord *tmin,
+                    const struct grail_coord *tmax)
+{
+        struct gesture_inserter *gin = ge->gin;
+        struct grail_coord dmin, dmax;
+        double sx, sy;
+        grail_get_units(ge, &dmin, &dmax);
+        sx = (tmax->x - tmin->x) / (dmax.x - dmin.x);
+        sy = (tmax->y - tmin->y) / (dmax.y - dmin.y);
+        gin->scale_x = sx;
+        gin->scale_y = sy;
+        gin->scale_r = sqrt((sx * sx + sy * sy) / 2);
+        gin->trans_x = tmin->x - dmin.x * sx;
+        gin->trans_y = tmin->y - dmin.y * sy;
+        gin->transformed = 1;
+}
diff --git a/test/grail-gesture.c b/test/grail-gesture.c
index c559661..762d3df 100644
--- a/test/grail-gesture.c
+++ b/test/grail-gesture.c
@@ -103,6 +103,10 @@ int main(int argc, char *argv[])
                 return -1;
         }
         grail_filter_abs_events(&ge, 1);
+
+        struct grail_coord min = { -2, -1 }, max = { 2, 1 };
+        grail_set_bbox(&ge, &min, &max);
+
         loop_device(&ge, fd);
         grail_close(&ge, fd);