api: add bounding box to rotate gestures

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

2 files changed, 17 insertions, 3 deletions

diff --git a/include/grail-types.h b/include/grail-types.h
index 27450fe..474261d 100644
--- a/include/grail-types.h
+++ b/include/grail-types.h
@@ -78,6 +78,10 @@
 #define GRAIL_PROP_ROTATE_DA    0       /* angle delta */
 #define GRAIL_PROP_ROTATE_VA    1       /* angular velocity */
 #define GRAIL_PROP_ROTATE_A     2       /* angle */
+#define GRAIL_PROP_ROTATE_X1    3       /* bounding box x1 */
+#define GRAIL_PROP_ROTATE_Y1    4       /* bounding box y1 */
+#define GRAIL_PROP_ROTATE_X2    5       /* bounding box x2 */
+#define GRAIL_PROP_ROTATE_Y2    6       /* bounding box y2 */
 
 #define GRAIL_MAIN_TAP          3
 #define GRAIL_PROP_TAP_DT       0       /* tap time (ms) */
diff --git a/src/gestures-rotate.c b/src/gestures-rotate.c
index 5763294..23bbfd6 100644
--- a/src/gestures-rotate.c
+++ b/src/gestures-rotate.c
@@ -35,12 +35,22 @@ static const int getype[DIM_TOUCH + 1] = {
 
 static const int fm_mask = 0x08;
 
-static void set_props(struct combo_model *s, const struct move_model *m)
+static void set_props(struct combo_model *s, const struct move_model *m,
+                      const struct touch_frame *frame)
 {
+        struct grail_coord min, max;
         s->prop[GRAIL_PROP_ROTATE_DA] = m->fm[FM_A].action_delta;
         s->prop[GRAIL_PROP_ROTATE_VA] = m->fm[FM_A].velocity;
         s->prop[GRAIL_PROP_ROTATE_A] = m->fm[FM_A].value;
         s->nprop = 3;
+        if (!frame->nactive)
+                return;
+        gru_compute_bbox(&min, &max, frame);
+        s->prop[GRAIL_PROP_ROTATE_X1] = min.x;
+        s->prop[GRAIL_PROP_ROTATE_Y1] = min.y;
+        s->prop[GRAIL_PROP_ROTATE_X2] = max.x;
+        s->prop[GRAIL_PROP_ROTATE_Y2] = max.y;
+        s->nprop = 7;
 }
 
 int gru_rotate(struct grail *ge,
@@ -69,7 +79,7 @@ int gru_rotate(struct grail *ge,
         }
         if (!(move->active & fm_mask))
                 return 0;
-        set_props(state, move);
+        set_props(state, move, frame);
         gru_event(ge, state->gid, move, state->prop, state->nprop);
         return 1;
 }
@@ -110,7 +120,7 @@ int gru_winrotate(struct grail *ge,
         }
         if (!(move->active & fm_mask))
                 return 0;
-        set_props(state, move);
+        set_props(state, move, frame);
         gru_event(ge, state->gid, move, state->prop, state->nprop);
         return 1;
 }