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, 69 insertions, 0 deletions

diff --git a/include/grail-types.h b/include/grail-types.h
index de9197b..f274963 100644
--- a/include/grail-types.h
+++ b/include/grail-types.h
@@ -71,6 +71,25 @@
 #define GRAIL_PROP_DRAG_VY      3       /* vertical velocity */
 #define GRAIL_PROP_DRAG_X       4       /* horizontal position */
 #define GRAIL_PROP_DRAG_Y       5       /* vertical position */
+#define GRAIL_PROP_DRAG_X1      6       /* bounding box x1 */
+#define GRAIL_PROP_DRAG_Y1      7       /* bounding box y1 */
+#define GRAIL_PROP_DRAG_X2      8       /* bounding box x2 */
+#define GRAIL_PROP_DRAG_Y2      9       /* bounding box y2 */
+#define GRAIL_PROP_DRAG_ID_T0   10      /* first touch id */
+#define GRAIL_PROP_DRAG_X_T0    11      /* first touch horizontal position */
+#define GRAIL_PROP_DRAG_Y_T0    12      /* first touch vertical position */
+#define GRAIL_PROP_DRAG_ID_T1   13
+#define GRAIL_PROP_DRAG_X_T1    14
+#define GRAIL_PROP_DRAG_Y_T1    15
+#define GRAIL_PROP_DRAG_ID_T2   16
+#define GRAIL_PROP_DRAG_X_T2    17
+#define GRAIL_PROP_DRAG_Y_T2    18
+#define GRAIL_PROP_DRAG_ID_T3   19
+#define GRAIL_PROP_DRAG_X_T3    20
+#define GRAIL_PROP_DRAG_Y_T3    21
+#define GRAIL_PROP_DRAG_ID_T4   22
+#define GRAIL_PROP_DRAG_X_T4    23
+#define GRAIL_PROP_DRAG_Y_T4    24
 
 #define GRAIL_PROP_PINCH_DR     0       /* radius delta */
 #define GRAIL_PROP_PINCH_VR     1       /* radial velocity */
@@ -79,6 +98,21 @@
 #define GRAIL_PROP_PINCH_Y1     4       /* bounding box y1 */
 #define GRAIL_PROP_PINCH_X2     5       /* bounding box x2 */
 #define GRAIL_PROP_PINCH_Y2     6       /* bounding box y2 */
+#define GRAIL_PROP_PINCH_ID_T0  7       /* first touch id */
+#define GRAIL_PROP_PINCH_X_T0   8       /* first touch horizontal position */
+#define GRAIL_PROP_PINCH_Y_T0   9       /* first touch vertical position */
+#define GRAIL_PROP_PINCH_ID_T1  10
+#define GRAIL_PROP_PINCH_X_T1   11
+#define GRAIL_PROP_PINCH_Y_T1   12
+#define GRAIL_PROP_PINCH_ID_T2  13
+#define GRAIL_PROP_PINCH_X_T2   14
+#define GRAIL_PROP_PINCH_Y_T2   15
+#define GRAIL_PROP_PINCH_ID_T3  16
+#define GRAIL_PROP_PINCH_X_T3   17
+#define GRAIL_PROP_PINCH_Y_T3   18
+#define GRAIL_PROP_PINCH_ID_T4  19
+#define GRAIL_PROP_PINCH_X_T4   20
+#define GRAIL_PROP_PINCH_Y_T4   21
 
 #define GRAIL_PROP_ROTATE_DA    0       /* angle delta */
 #define GRAIL_PROP_ROTATE_VA    1       /* angular velocity */
@@ -87,9 +121,44 @@
 #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_PROP_ROTATE_ID_T0 7       /* first touch id */
+#define GRAIL_PROP_ROTATE_X_T0  8       /* first touch horizontal position */
+#define GRAIL_PROP_ROTATE_Y_T0  9       /* first touch vertical position */
+#define GRAIL_PROP_ROTATE_ID_T1 10
+#define GRAIL_PROP_ROTATE_X_T1  11
+#define GRAIL_PROP_ROTATE_Y_T1  12
+#define GRAIL_PROP_ROTATE_ID_T2 13
+#define GRAIL_PROP_ROTATE_X_T2  14
+#define GRAIL_PROP_ROTATE_Y_T2  15
+#define GRAIL_PROP_ROTATE_ID_T3 16
+#define GRAIL_PROP_ROTATE_X_T3  17
+#define GRAIL_PROP_ROTATE_Y_T3  18
+#define GRAIL_PROP_ROTATE_ID_T4 19
+#define GRAIL_PROP_ROTATE_X_T4  20
+#define GRAIL_PROP_ROTATE_Y_T4  21
 
 #define GRAIL_PROP_TAP_DT       0       /* tap time (ms) */
 #define GRAIL_PROP_TAP_X        1       /* horizontal position */
 #define GRAIL_PROP_TAP_Y        2       /* vertical position */
+#define GRAIL_PROP_TAP_X1       3       /* bounding box x1 */
+#define GRAIL_PROP_TAP_Y1       4       /* bounding box y1 */
+#define GRAIL_PROP_TAP_X2       5       /* bounding box x2 */
+#define GRAIL_PROP_TAP_Y2       6       /* bounding box y2 */
+#define GRAIL_PROP_TAP_ID_T0    7       /* first touch id */
+#define GRAIL_PROP_TAP_X_T0     8       /* first touch horizontal position */
+#define GRAIL_PROP_TAP_Y_T0     9       /* first touch vertical position */
+#define GRAIL_PROP_TAP_ID_T1    10
+#define GRAIL_PROP_TAP_X_T1     11
+#define GRAIL_PROP_TAP_Y_T1     12
+#define GRAIL_PROP_TAP_ID_T2    13
+#define GRAIL_PROP_TAP_X_T2     14
+#define GRAIL_PROP_TAP_Y_T2     15
+#define GRAIL_PROP_TAP_ID_T3    16
+#define GRAIL_PROP_TAP_X_T3     17
+#define GRAIL_PROP_TAP_Y_T3     18
+#define GRAIL_PROP_TAP_ID_T4    19
+#define GRAIL_PROP_TAP_X_T4     20
+#define GRAIL_PROP_TAP_Y_T4     21
+
 
 #endif