Add four-finger and five-finger gestures

Add four-finger and five-finger gestures, and move all gesture types
out to a separate file.

Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>

2 files changed, 57 insertions, 16 deletions

diff --git a/include/grail-types.h b/include/grail-types.h
new file mode 100644
index 0000000..7de3d9a
--- /dev/null
+++ b/include/grail-types.h
@@ -0,0 +1,56 @@
+/*****************************************************************************
+ *
+ * grail - Gesture Recognition And Instantiation Library
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Henrik Rydberg <rydberg@bitmath.org>
+ *
+ ****************************************************************************/
+
+#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 */
+
+#endif
diff --git a/include/grail.h b/include/grail.h
index 1113188..a100b36 100644
--- a/include/grail.h
+++ b/include/grail.h
@@ -26,6 +26,7 @@
 #define _GRAIL_H
 
 #include <grail-bits.h>
+#include <grail-types.h>
 #include <linux/input.h>
 
 #define DIM_GRAIL_TYPE          64
@@ -34,22 +35,6 @@
 #define DIM_GRAIL_PROP          16
 #define DIM_GRAIL_PROP_BYTES    ((DIM_GRAIL_PROP + 7) >> 3)
 
-#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_TAP1         9       /* single one-finger tap */
-#define GRAIL_TYPE_TAP2         10      /* single two-finger tap */
-#define GRAIL_TYPE_TAP3         11      /* single three-finger tap */
-#define GRAIL_TYPE_TAP4         12      /* single four-finger tap */
-#define GRAIL_TYPE_TAP5         13      /* single five-finger tap */
-
 #define GRAIL_STATUS_BEGIN      0
 #define GRAIL_STATUS_UPDATE     1
 #define GRAIL_STATUS_END        2