summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/grail-types.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/grail-types.h b/include/grail-types.h
index 474261d..de9197b 100644
--- a/include/grail-types.h
+++ b/include/grail-types.h
@@ -57,7 +57,14 @@
57#define GRAIL_TYPE_MPINCH 24 /* four-finger meta drag */ 57#define GRAIL_TYPE_MPINCH 24 /* four-finger meta drag */
58#define GRAIL_TYPE_MROTATE 25 /* four-finger meta drag */ 58#define GRAIL_TYPE_MROTATE 25 /* four-finger meta drag */
59 59
60#define GRAIL_TYPE_SYSFLAG1 26 /* reserved system flag */
61
60#define GRAIL_MAIN_DRAG 0 62#define GRAIL_MAIN_DRAG 0
63#define GRAIL_MAIN_PINCH 1
64#define GRAIL_MAIN_ROTATE 2
65#define GRAIL_MAIN_TAP 3
66#define GRAIL_MAIN_SYSFLAG 4
67
61#define GRAIL_PROP_DRAG_DX 0 /* horizontal position delta */ 68#define GRAIL_PROP_DRAG_DX 0 /* horizontal position delta */
62#define GRAIL_PROP_DRAG_DY 1 /* vertical position delta */ 69#define GRAIL_PROP_DRAG_DY 1 /* vertical position delta */
63#define GRAIL_PROP_DRAG_VX 2 /* horizontal velocity */ 70#define GRAIL_PROP_DRAG_VX 2 /* horizontal velocity */
@@ -65,7 +72,6 @@
65#define GRAIL_PROP_DRAG_X 4 /* horizontal position */ 72#define GRAIL_PROP_DRAG_X 4 /* horizontal position */
66#define GRAIL_PROP_DRAG_Y 5 /* vertical position */ 73#define GRAIL_PROP_DRAG_Y 5 /* vertical position */
67 74
68#define GRAIL_MAIN_PINCH 1
69#define GRAIL_PROP_PINCH_DR 0 /* radius delta */ 75#define GRAIL_PROP_PINCH_DR 0 /* radius delta */
70#define GRAIL_PROP_PINCH_VR 1 /* radial velocity */ 76#define GRAIL_PROP_PINCH_VR 1 /* radial velocity */
71#define GRAIL_PROP_PINCH_R 2 /* radius */ 77#define GRAIL_PROP_PINCH_R 2 /* radius */
@@ -74,7 +80,6 @@
74#define GRAIL_PROP_PINCH_X2 5 /* bounding box x2 */ 80#define GRAIL_PROP_PINCH_X2 5 /* bounding box x2 */
75#define GRAIL_PROP_PINCH_Y2 6 /* bounding box y2 */ 81#define GRAIL_PROP_PINCH_Y2 6 /* bounding box y2 */
76 82
77#define GRAIL_MAIN_ROTATE 2
78#define GRAIL_PROP_ROTATE_DA 0 /* angle delta */ 83#define GRAIL_PROP_ROTATE_DA 0 /* angle delta */
79#define GRAIL_PROP_ROTATE_VA 1 /* angular velocity */ 84#define GRAIL_PROP_ROTATE_VA 1 /* angular velocity */
80#define GRAIL_PROP_ROTATE_A 2 /* angle */ 85#define GRAIL_PROP_ROTATE_A 2 /* angle */
@@ -83,7 +88,6 @@
83#define GRAIL_PROP_ROTATE_X2 5 /* bounding box x2 */ 88#define GRAIL_PROP_ROTATE_X2 5 /* bounding box x2 */
84#define GRAIL_PROP_ROTATE_Y2 6 /* bounding box y2 */ 89#define GRAIL_PROP_ROTATE_Y2 6 /* bounding box y2 */
85 90
86#define GRAIL_MAIN_TAP 3
87#define GRAIL_PROP_TAP_DT 0 /* tap time (ms) */ 91#define GRAIL_PROP_TAP_DT 0 /* tap time (ms) */
88#define GRAIL_PROP_TAP_X 1 /* horizontal position */ 92#define GRAIL_PROP_TAP_X 1 /* horizontal position */
89#define GRAIL_PROP_TAP_Y 2 /* vertical position */ 93#define GRAIL_PROP_TAP_Y 2 /* vertical position */