From 7be96df1c903c11711336c5ad1859b347ae4b661 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Tue, 10 Aug 2010 11:47:00 +0100 Subject: api: Rename gestures to conform to design docs Use the names drag, pinch and rotate, and remove the combo gesture. Signed-off-by: Henrik Rydberg --- include/grail-types.h | 59 ++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 27 deletions(-) (limited to 'include') diff --git a/include/grail-types.h b/include/grail-types.h index 7de11b0..028a71b 100644 --- a/include/grail-types.h +++ b/include/grail-types.h @@ -23,32 +23,37 @@ #ifndef _GRAIL_TYPES_H #define _GRAIL_TYPES_H -#define GRAIL_TYPE_POINTER 0 /* reserved */ - -#define GRAIL_TYPE_PAN 1 /* two-finger pan/scroll */ -#define GRAIL_TYPE_PINCH 2 /* two-finger pinch-to-zoom */ -#define GRAIL_TYPE_ROTATE 3 /* two-finger rotation */ -#define GRAIL_TYPE_COMBO2 4 /* two-finger combo */ - -#define GRAIL_TYPE_SWIPE 5 /* three-finger pan */ -#define GRAIL_TYPE_SCALE 6 /* three-finger pinch */ -#define GRAIL_TYPE_TURN 7 /* three-finger rotate */ -#define GRAIL_TYPE_COMBO3 8 /* three-finger combo */ - -#define GRAIL_TYPE_BRUSH 9 /* four-finger pan */ -#define GRAIL_TYPE_PICK 10 /* four-finger pinch */ -#define GRAIL_TYPE_WHIRL 11 /* four-finger rotate */ -#define GRAIL_TYPE_COMBO4 12 /* four-finger combo */ - -#define GRAIL_TYPE_HAND 13 /* five-finger pan */ -#define GRAIL_TYPE_GRAB 14 /* five-finger pinch */ -#define GRAIL_TYPE_REVOLVE 15 /* five-finger rotate */ -#define GRAIL_TYPE_COMBO5 16 /* five-finger combo */ - -#define GRAIL_TYPE_TAP1 17 /* single one-finger tap */ -#define GRAIL_TYPE_TAP2 18 /* single two-finger tap */ -#define GRAIL_TYPE_TAP3 19 /* single three-finger tap */ -#define GRAIL_TYPE_TAP4 20 /* single four-finger tap */ -#define GRAIL_TYPE_TAP5 21 /* single five-finger tap */ +#define GRAIL_TYPE_DRAG1 0 /* one-finger drag/pan/scroll */ +#define GRAIL_TYPE_PINCH1 1 /* one-finger pinch-to-zoom */ +#define GRAIL_TYPE_ROTATE1 2 /* one-finger rotation */ + +#define GRAIL_TYPE_DRAG2 3 /* two-finger drag/pan/scroll */ +#define GRAIL_TYPE_PINCH2 4 /* two-finger pinch-to-zoom */ +#define GRAIL_TYPE_ROTATE2 5 /* two-finger rotation */ + +#define GRAIL_TYPE_DRAG3 6 /* three-finger drag/pan */ +#define GRAIL_TYPE_PINCH3 7 /* three-finger pinch */ +#define GRAIL_TYPE_ROTATE3 8 /* three-finger rotate */ + +#define GRAIL_TYPE_DRAG4 9 /* four-finger drag/pan */ +#define GRAIL_TYPE_PINCH4 10 /* four-finger pinch */ +#define GRAIL_TYPE_ROTATE4 11 /* four-finger rotate */ + +#define GRAIL_TYPE_DRAG5 12 /* five-finger drag/pan */ +#define GRAIL_TYPE_PINCH5 13 /* five-finger pinch */ +#define GRAIL_TYPE_ROTATE5 14 /* five-finger rotate */ + +#define GRAIL_TYPE_TAP1 15 /* one-finger single tap */ +#define GRAIL_TYPE_TAP2 16 /* two-finger single tap */ +#define GRAIL_TYPE_TAP3 17 /* three-finger single tap */ +#define GRAIL_TYPE_TAP4 18 /* four-finger single tap */ +#define GRAIL_TYPE_TAP5 19 /* five-finger single tap */ + +#define GRAIL_PROP_DRAG_DX 0 /* horizontal position delta */ +#define GRAIL_PROP_DRAG_DY 1 /* vertical position delta */ +#define GRAIL_PROP_DRAG_VX 2 /* horizontal velocity */ +#define GRAIL_PROP_DRAG_VY 3 /* vertical velocity */ +#define GRAIL_PROP_DRAG_X 4 /* horizontal position */ +#define GRAIL_PROP_DRAG_Y 5 /* vertical position */ #endif -- cgit v1.2.3