1 files changed, 12 insertions, 5 deletions

diff --git a/src/gestures-tapping.c b/src/gestures-tapping.c
index 52c5fdb..371dbde 100644
--- a/src/gestures-tapping.c
+++ b/src/gestures-tapping.c
@@ -31,6 +31,17 @@ static const int TAP_MIN_GAP_MS = 25;
 
 static const int fm_mask = 0x03;
 
+static void set_props(const struct gesture_inserter *gin,
+                      struct tapping_model *s, const struct move_model *m,
+                      const struct touch_frame *frame)
+{
+        s->prop[GRAIL_PROP_TAP_DT] = m->time - s->start;
+        s->prop[GRAIL_PROP_TAP_X] = gin_prop_x(gin, m->fm[FM_X].value);
+        s->prop[GRAIL_PROP_TAP_Y] = gin_prop_y(gin, m->fm[FM_Y].value);
+        s->nprop = 3;
+        s->nprop += gin_add_contact_props(gin, s->prop + s->nprop, frame);
+}
+
 int gru_tapping(struct grail *ge,
                 const struct touch_frame *frame)
 {
@@ -44,11 +55,7 @@ int gru_tapping(struct grail *ge,
                 if (!state->ntouch)
                         state->start = move->time;
                 if (move->ntouch >= state->ntouch) {
-                        state->prop[GRAIL_PROP_TAP_DT] =
-                                move->time - state->start;
-                        state->prop[GRAIL_PROP_TAP_X] = move->fm[FM_X].value;
-                        state->prop[GRAIL_PROP_TAP_Y] = move->fm[FM_Y].value;
-                        state->nprop = 3;
+                        set_props(ge->gin, state, move, frame);
                 }
                 if (move->ntouch > state->ntouch) {
                         state->ntouch = move->ntouch;