summaryrefslogtreecommitdiff
path: root/src/grail-inserter.c
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2010-08-10 12:45:52 +0100
committerHenrik Rydberg <rydberg@euromail.se>2010-08-10 15:04:18 +0100
commitda425afd6199995ac7b6f23bf8744a435cc02e23 (patch)
tree8d92f683714eeda226aac2499b82a484fae3c137 /src/grail-inserter.c
parent7be96df1c903c11711336c5ad1859b347ae4b661 (diff)
Add property declarations to grail-types
Also add accumulated values for delta and velocity properties. Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'src/grail-inserter.c')
-rw-r--r--src/grail-inserter.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/grail-inserter.c b/src/grail-inserter.c
index 6ba9662..d982808 100644
--- a/src/grail-inserter.c
+++ b/src/grail-inserter.c
@@ -262,7 +262,8 @@ void gin_gid_event(struct grail *ge, int gid,
262} 262}
263 263
264void gin_gid_end(struct grail *ge, int gid, 264void gin_gid_end(struct grail *ge, int gid,
265 float x, float y, int ntouch) 265 float x, float y, int ntouch,
266 const grail_prop_t *prop, int nprop)
266{ 267{
267 struct gesture_inserter *gin = ge->gin; 268 struct gesture_inserter *gin = ge->gin;
268 struct gesture_event ev; 269 struct gesture_event ev;
@@ -274,10 +275,11 @@ void gin_gid_end(struct grail *ge, int gid,
274 if (s->status != GRAIL_STATUS_BEGIN) { 275 if (s->status != GRAIL_STATUS_BEGIN) {
275 ev.status = GRAIL_STATUS_END; 276 ev.status = GRAIL_STATUS_END;
276 ev.ntouch = ntouch; 277 ev.ntouch = ntouch;
277 ev.nprop = 0; 278 ev.nprop = nprop;
278 ev.time = gin->time; 279 ev.time = gin->time;
279 ev.pos.x = x; 280 ev.pos.x = x;
280 ev.pos.y = y; 281 ev.pos.y = y;
282 memcpy(ev.prop, prop, nprop * sizeof(grail_prop_t));
281 gebuf_put(&s->buf, &ev); 283 gebuf_put(&s->buf, &ev);
282 } 284 }
283 s->status = GRAIL_STATUS_END; 285 s->status = GRAIL_STATUS_END;