Merge lp:~bregma/geis/lp-742555 into lp:geis

[Stephen M. Webb]

Adds through support for TOUCH gesture types for direct touch begin/end handling.

[Chase Douglas (chasedouglas)]

I'd prefer to move to C99 and use dynamic array sizes than use alloca, just cause it seems more conventional.

The s_grail_class_map array has a bunch of changes to unaffected gesture types. It appears there's a comma added near the end of each line. I think the comma is superfluous and should be removed so there's no change.

grail_mask_clear could just use memset, which would make the code more readable.

Why does grail_mask_setbit only concern itself with the lower 5 bits of each uint32_t?

Although grail exposes velocity attributes for touch gestures, I don't want to expose the attributes through GEIS. I propose masking them out.

Looks good otherwise!

review: Needs Fixing

[lp:~bregma/geis/lp-742555]

130. By Stephen M. Webb on 2011-03-25

* Replaced alloca() calls with C99 dynamic arrays.
* Used memset instead of a for-loop for array initialization.
* Removed extraneous commas from s_grail_class_map.

131. By Stephen M. Webb on 2011-03-25

Properly initialized the grail gesture bitmask in all cases.

[Stephen M. Webb (bregma)]

New revision pushed up.

(1) alloca() replaced by C99 dynamic arrays.
(b) used memset() instead of a for-loop to initialize the array.
(3) removed extraneous commas.
(5) initialized all instances of mask_len.

grail_mask_setbit() only concerns itself with the lower 2^5 bits of each uint32_t because there are only 2^5 bits in a uint32_t.

[lp:~bregma/geis/lp-742555]

132. By Stephen M. Webb on 2011-03-25

Cleared touch count mask.

133. By Stephen M. Webb on 2011-03-28

Changed the list of properties received from grail for the Touch gesture.

[Chase Douglas (chasedouglas)]

The code looks good now, and geistest is behaving as I expect :).

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-03-24 19:38:36 +0000
+++ ChangeLog	2011-03-28 12:59:24 +0000
@@ -1,3 +1,24 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Changes the list of attrs received from grail for the Touch gesture.
+
+  * libutouch-geis/backend/xcb/grail_gestures.c: change Touch attrs
+
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Added new TOUCH gesture types (LP: #742555).
+
+  * include/geis/geis.h: added new TOUCH gesture types
+  * libutouch-geis/backend/xcb/geis_xcb_backend.c: tweaked gesture mask size
+  * libutouch-geis/backend/xcb/grail_gestures.c: added new TOUCH gesture types
+    added proper handling of a variable-size gesture mask
+  * libutouch-geis/geis_v1.c: mapped new TOUCH gesture types to grail TOUCH
+    gesture types
+  * testsuite/geis1/check_gesture_types.c: new testsuite
+  * testsuite/geis1/Makefile.am: added new testsuite
+  * testsuite/geis1/check_geis1_api.c: invoked new testsuite
+  * testsuite/geistest/geistest.c: added new gesture types
+
 2011-03-24  Stephen M. Webb  <[e-mail]>
 
   Fixed a bad index when translating grail touches (LP: #742002).

=== modified file 'include/geis/geis.h'
--- include/geis/geis.h	2011-03-17 23:42:48 +0000
+++ include/geis/geis.h	2011-03-28 12:59:24 +0000
@@ -107,6 +107,7 @@
 #define GEIS_GESTURE_PINCH   "Pinch"
 #define GEIS_GESTURE_ROTATE  "Rotate"
 #define GEIS_GESTURE_TAP     "Tap"
+#define GEIS_GESTURE_TOUCH   "Touch"
 
 /**
  * @defgroup geis_v1_gesture_types Gesture Types
@@ -143,11 +144,15 @@
  *
  * @def GEIS_GESTURE_PRIMITIVE_TAP
  * A tap.  Touch down, touch up, one or more touches.
+ *
+ * @def GEIS_GESTURE_PRIMITIVE_TOUCH
+ * A parenthetical gesture event.  Touch down (start) and up (finish).
  */
 #define GEIS_GESTURE_PRIMITIVE_DRAG    0
 #define GEIS_GESTURE_PRIMITIVE_PINCH   1
 #define GEIS_GESTURE_PRIMITIVE_ROTATE  2
 #define GEIS_GESTURE_PRIMITIVE_TAP    15 
+#define GEIS_GESTURE_PRIMITIVE_TOUCH  32
 
 /* @} */
 
@@ -182,6 +187,11 @@
 #define GEIS_GESTURE_TYPE_TAP3    "Tap,touch=3"
 #define GEIS_GESTURE_TYPE_TAP4    "Tap,touch=4"
 #define GEIS_GESTURE_TYPE_TAP5    "Tap,touch=5"
+#define GEIS_GESTURE_TYPE_TOUCH1  "Touch,touch=1"
+#define GEIS_GESTURE_TYPE_TOUCH2  "Touch,touch=2"
+#define GEIS_GESTURE_TYPE_TOUCH3  "Touch,touch=3"
+#define GEIS_GESTURE_TYPE_TOUCH4  "Touch,touch=4"
+#define GEIS_GESTURE_TYPE_TOUCH5  "Touch,touch=5"
 
 /* @} */
 

=== modified file 'libutouch-geis/backend/xcb/geis_xcb_backend.c'
--- libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-03-24 19:38:36 +0000
+++ libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-03-28 12:59:24 +0000
@@ -47,6 +47,8 @@
 #define MAX_NUM_DEVICES 10
 #define MAX_NUM_WINDOWS 10
 
+#define GRAIL_XCB_BITMASK_LEN 2
+
 
 static inline GeisSize
 _min(GeisSize a, GeisSize b)
@@ -83,7 +85,7 @@
   uint16_t      devices[MAX_NUM_DEVICES]; 
   uint16_t      device_count;
   int           num_class_filters;
-  uint32_t      mask[1];
+  uint32_t      mask[GRAIL_XCB_BITMASK_LEN];
   uint32_t      mask_len;
   int           num_region_filters;
   xcb_window_t  windows[MAX_NUM_WINDOWS];
@@ -537,8 +539,8 @@
   GeisString class_name  = NULL;
   GeisSize   min_touches = MIN_TOUCHES;
   GeisSize   max_touches = MAX_TOUCHES;
-  uint32_t   mask_len;
-  uint32_t   mask[1];
+  uint32_t   mask_len    = GRAIL_XCB_BITMASK_LEN;
+  uint32_t   mask[mask_len];
 
   geis_xcb_backend_gesture_bitmask_init(geis_subscription_flags(sub),
                                         &mask_len, mask);
@@ -600,6 +602,7 @@
     geis_error("error allocating xcb-gesture subscription");
     goto error_exit;
   }
+  xsub->mask_len = GRAIL_XCB_BITMASK_LEN;
 
   /* Translate the GEIS v2 subscription into an XCB subscription. */
   for (i = 0; i < filter_count; ++i)
@@ -652,13 +655,13 @@
       xcb_generic_error_t  *error;
       xcb_void_cookie_t select_cookie;
 
-      geis_debug("window_id=0x%08x device_id=%d mask_len=%d mask[0]=0x%08x",
+      geis_debug("window_id=0x%08x device_id=%d mask_len=%d mask=0x%08x %08x",
                  xsub->windows[win], xsub->devices[dev],
-                 xsub->mask_len, xsub->mask[0]);
+                 xsub->mask_len, xsub->mask[1], xsub->mask[0]);
       select_cookie = xcb_gesture_select_events_checked(xcb->xcb_connection,
                                                         xsub->windows[win],
-                                                        xsub->devices[dev],
-                                                        xsub->mask_len,
+                                                        (uint16_t)xsub->devices[dev],
+                                                        (uint16_t)xsub->mask_len,
                                                         xsub->mask);
       error = xcb_request_check(xcb->xcb_connection, select_cookie);
       if (error)

=== modified file 'libutouch-geis/backend/xcb/grail_gestures.c'
--- libutouch-geis/backend/xcb/grail_gestures.c	2011-03-22 16:14:01 +0000
+++ libutouch-geis/backend/xcb/grail_gestures.c	2011-03-28 12:59:24 +0000
@@ -38,6 +38,14 @@
 
 static GeisFloat zero = 0.0f;
 
+static struct _AttrInitializer s_touch_attrs[] = {
+  { GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X1, GEIS_ATTR_TYPE_FLOAT, &zero },
+  { GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y1, GEIS_ATTR_TYPE_FLOAT, &zero },
+  { GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_X2, GEIS_ATTR_TYPE_FLOAT, &zero },
+  { GEIS_GESTURE_ATTRIBUTE_BOUNDINGBOX_Y2, GEIS_ATTR_TYPE_FLOAT, &zero },
+  { NULL, 0, &zero }
+};
+
 static struct _AttrInitializer s_drag_attrs[] = {
   { GEIS_GESTURE_ATTRIBUTE_DELTA_X,        GEIS_ATTR_TYPE_FLOAT, &zero },
   { GEIS_GESTURE_ATTRIBUTE_DELTA_Y,        GEIS_ATTR_TYPE_FLOAT, &zero },
@@ -128,19 +136,54 @@
   { GRAIL_TYPE_TAP3,    GEIS_GESTURE_PRIMITIVE_TAP,    GEIS_GESTURE_TYPE_TAP3,    GEIS_GESTURE_TAP,    s_tap_attrs,    3 },
   { GRAIL_TYPE_TAP4,    GEIS_GESTURE_PRIMITIVE_TAP,    GEIS_GESTURE_TYPE_TAP4,    GEIS_GESTURE_TAP,    s_tap_attrs,    4 },
   { GRAIL_TYPE_TAP5,    GEIS_GESTURE_PRIMITIVE_TAP,    GEIS_GESTURE_TYPE_TAP5,    GEIS_GESTURE_TAP,    s_tap_attrs,    5 },
+  { GRAIL_TYPE_TOUCH1,  GEIS_GESTURE_PRIMITIVE_TOUCH,  GEIS_GESTURE_TYPE_TOUCH1,  GEIS_GESTURE_TOUCH,  s_touch_attrs,  1 },
+  { GRAIL_TYPE_TOUCH2,  GEIS_GESTURE_PRIMITIVE_TOUCH,  GEIS_GESTURE_TYPE_TOUCH2,  GEIS_GESTURE_TOUCH,  s_touch_attrs,  2 },
+  { GRAIL_TYPE_TOUCH3,  GEIS_GESTURE_PRIMITIVE_TOUCH,  GEIS_GESTURE_TYPE_TOUCH3,  GEIS_GESTURE_TOUCH,  s_touch_attrs,  3 },
+  { GRAIL_TYPE_ETOUCH,  GEIS_GESTURE_PRIMITIVE_TOUCH,  GEIS_GESTURE_TYPE_TOUCH3,  GEIS_GESTURE_TOUCH,  s_touch_attrs,  3 },
+  { GRAIL_TYPE_TOUCH4,  GEIS_GESTURE_PRIMITIVE_TOUCH,  GEIS_GESTURE_TYPE_TOUCH4,  GEIS_GESTURE_TOUCH,  s_touch_attrs,  4 },
+  { GRAIL_TYPE_MTOUCH,  GEIS_GESTURE_PRIMITIVE_TOUCH,  GEIS_GESTURE_TYPE_TOUCH4,  GEIS_GESTURE_TOUCH,  s_touch_attrs,  4 },
+  { GRAIL_TYPE_TOUCH5,  GEIS_GESTURE_PRIMITIVE_TOUCH,  GEIS_GESTURE_TYPE_TOUCH5,  GEIS_GESTURE_TOUCH,  s_touch_attrs,  5 },
   { -1, -1, NULL, NULL, NULL, 0 } /* sentinel */
 };
 
 
 /*
- * Gets the bitmask for an entry in the GrailClassMap.
- */
-static inline GeisInteger
-_grail_bitmask_for(const GrailClassMap *entry)
-{
-  return 1 << entry->grail_type;
-}
-
+ * Clears all the bits in a bitmask.
+ */
+static inline void
+_grail_mask_clear(uint32_t  mask_len,
+                  uint32_t* mask)
+{
+  memset(mask, 0, mask_len * sizeof(uint32_t));
+}
+
+/*
+ * Sets the indicated bit in the bitmask.
+ *
+ * @todo: convert form uint32_t masks to byte masks
+ */
+static inline void
+_grail_mask_set_bit(uint32_t  mask_len __attribute__((unused)),
+                    uint32_t* mask,
+                    int       index)
+{
+  mask[index >> 5] |= 1 << (index & 0x1f);
+}
+
+/*
+ * Masks the bits in one bitmask by the bots in another.
+ */
+static inline void
+_grail_mask_and(uint32_t  mask_len,
+                uint32_t* mask_lhs,
+                uint32_t* mask_rhs)
+{
+  uint32_t i;
+  for (i = 0; i < mask_len; ++i)
+  {
+    mask_lhs[i] &= mask_rhs[i];
+  }
+}
 
 /*
  * Initializes the XCB gesture bitmap flags.
@@ -153,40 +196,46 @@
                                       uint32_t              *mask_len,
                                       uint32_t              *mask)
 {
-  *mask_len = 1; /* always */
-  *mask = 0;
-  *mask = (1 << GRAIL_TYPE_DRAG1)
-        | (1 << GRAIL_TYPE_PINCH1)
-        | (1 << GRAIL_TYPE_ROTATE1)
-        | (1 << GRAIL_TYPE_TAP1)
-        | (1 << GRAIL_TYPE_DRAG2)
-        | (1 << GRAIL_TYPE_PINCH2)
-        | (1 << GRAIL_TYPE_ROTATE2)
-        | (1 << GRAIL_TYPE_TAP2)
-        | (1 << GRAIL_TYPE_TAP3)
-        | (1 << GRAIL_TYPE_TAP4)
-        | (1 << GRAIL_TYPE_DRAG5)
-        | (1 << GRAIL_TYPE_PINCH5)
-        | (1 << GRAIL_TYPE_ROTATE5)
-        | (1 << GRAIL_TYPE_TAP5);
+  _grail_mask_clear(*mask_len, mask);
+
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_DRAG1);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_PINCH1);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_ROTATE1);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_TAP1);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_TOUCH1);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_DRAG2);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_PINCH2);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_ROTATE2);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_TAP2);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_TOUCH2);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_TAP3);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_TAP4);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_DRAG5);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_PINCH5);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_ROTATE5);
+  _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_TAP5);
 
   if (sub_flags & GEIS_SUBSCRIPTION_CONT)
   {
-    *mask |= ( (1 << GRAIL_TYPE_EDRAG)
-             | (1 << GRAIL_TYPE_EPINCH)
-             | (1 << GRAIL_TYPE_EROTATE)
-             | (1 << GRAIL_TYPE_MDRAG)
-             | (1 << GRAIL_TYPE_MPINCH)
-             | (1 << GRAIL_TYPE_MROTATE) );
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_EDRAG);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_EPINCH);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_EROTATE);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_ETOUCH);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_MDRAG);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_MPINCH);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_MROTATE);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_MTOUCH);
   }
   else
   {
-    *mask |= ( (1 << GRAIL_TYPE_DRAG3)
-             | (1 << GRAIL_TYPE_PINCH3)
-             | (1 << GRAIL_TYPE_ROTATE3)
-             | (1 << GRAIL_TYPE_DRAG4)
-             | (1 << GRAIL_TYPE_PINCH4)
-             | (1 << GRAIL_TYPE_ROTATE4) );
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_DRAG3);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_PINCH3);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_ROTATE3);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_TOUCH3);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_DRAG4);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_PINCH4);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_ROTATE4);
+    _grail_mask_set_bit(*mask_len, mask, GRAIL_TYPE_TOUCH4);
   }
 
 
@@ -194,7 +243,7 @@
   {
     *mask |= (1 << GRAIL_TYPE_SYSFLAG1);
   }
-geis_debug("initial bitmap is 0x%08x", *mask);
+geis_debug("initial bitmap is 0x%08x %08x", mask[1], mask[0]);
 }
 
 
@@ -203,23 +252,25 @@
  */
 void
 geis_xcb_backend_gesture_bitmask_filter_class(GeisString  class_name,
-                                              uint32_t   *mask_len __attribute__((unused)),
+                                              uint32_t   *mask_len,
                                               uint32_t   *mask)
 {
-  uint32_t class_mask = 0;
   const GrailClassMap *grail_class;
+  uint32_t class_mask[*mask_len];
+
+  _grail_mask_clear(*mask_len, class_mask);
   for (grail_class = s_grail_class_map;
        grail_class->geis_class_id >= 0;
        ++grail_class)
   {
     if (0 == strcmp(grail_class->class_name, class_name))
     {
-      class_mask |= _grail_bitmask_for(grail_class);
+      _grail_mask_set_bit(*mask_len, class_mask, grail_class->grail_type);
     }
   }
-  *mask &= class_mask;
-  geis_debug("class=\"%s\" mask=0x%08x bitmap is now 0x%08x",
-             class_name, class_mask, *mask);
+  _grail_mask_and(*mask_len, mask, class_mask);
+  geis_debug("class=\"%s\" mask is 0x%08x %08x bitmap is now 0x%08x %08x",
+             class_name, class_mask[1], class_mask[0], mask[1], mask[0]);
 }
 
 
@@ -230,11 +281,13 @@
 void
 geis_xcb_backend_gesture_bitmask_filter_touches(GeisSize min_touches,
                                                 GeisSize max_touches,
-                                                uint32_t   *mask_len __attribute__((unused)),
+                                                uint32_t   *mask_len,
                                                 uint32_t   *mask)
 {
-  uint32_t touch_mask = 0;
   const GrailClassMap *grail_class;
+  uint32_t touch_mask[*mask_len];
+
+  _grail_mask_clear(*mask_len, touch_mask);
   for (grail_class = s_grail_class_map;
        grail_class->geis_class_id >= 0;
        ++grail_class)
@@ -242,12 +295,12 @@
     if (min_touches <= grail_class->touch_count
      && grail_class->touch_count <= max_touches)
     {
-      touch_mask |= _grail_bitmask_for(grail_class);
+      _grail_mask_set_bit(*mask_len, touch_mask, grail_class->grail_type);
     }
   }
-  *mask &= touch_mask;
-  geis_debug("min_touches=%lu max_touches=%lu mask=0x%08x bitmap is now 0x%08x",
-             min_touches, max_touches, touch_mask, *mask);
+  _grail_mask_and(*mask_len, mask, touch_mask);
+  geis_debug("min_touches=%lu max_touches=%lu mask is 0x%08x %08x bitmap is now 0x%08x %08x",
+             min_touches, max_touches, touch_mask[1], touch_mask[0], mask[1], mask[0]);
 }
 
 

=== modified file 'libutouch-geis/geis_v1.c'
--- libutouch-geis/geis_v1.c	2011-03-13 18:00:45 +0000
+++ libutouch-geis/geis_v1.c	2011-03-28 12:59:24 +0000
@@ -72,6 +72,11 @@
   { GEIS_GESTURE_TYPE_TAP3,    GEIS_GESTURE_TAP,    3 },
   { GEIS_GESTURE_TYPE_TAP4,    GEIS_GESTURE_TAP,    4 },
   { GEIS_GESTURE_TYPE_TAP5,    GEIS_GESTURE_TAP,    5 },
+  { GEIS_GESTURE_TYPE_TOUCH1,  GEIS_GESTURE_TOUCH,  1 },
+  { GEIS_GESTURE_TYPE_TOUCH2,  GEIS_GESTURE_TOUCH,  2 },
+  { GEIS_GESTURE_TYPE_TOUCH3,  GEIS_GESTURE_TOUCH,  3 },
+  { GEIS_GESTURE_TYPE_TOUCH4,  GEIS_GESTURE_TOUCH,  4 },
+  { GEIS_GESTURE_TYPE_TOUCH5,  GEIS_GESTURE_TOUCH,  5 },
   { NULL,                      NULL,                0 }
 };
 

=== modified file 'testsuite/geis1/Makefile.am'
--- testsuite/geis1/Makefile.am	2011-03-08 14:49:28 +0000
+++ testsuite/geis1/Makefile.am	2011-03-28 12:59:24 +0000
@@ -15,6 +15,7 @@
 
 check_geis1_api_SOURCES = \
 	check_instance.c \
+	check_gesture_types.c \
 	check_gesture_attrs.c \
 	check_geis1_api.c
 

=== modified file 'testsuite/geis1/check_geis1_api.c'
--- testsuite/geis1/check_geis1_api.c	2011-03-08 14:49:28 +0000
+++ testsuite/geis1/check_geis1_api.c	2011-03-28 12:59:24 +0000
@@ -21,6 +21,7 @@
 #include <check.h>
 
 extern Suite *geis1_instance_suite_new();
+extern Suite *geis1_gesture_types_new();
 extern Suite *geis1_gesture_attrs_new();
 
 int
@@ -31,6 +32,7 @@
   Suite *s = suite_create("GEIS v1.0 API");
   SRunner *sr = srunner_create(s);
   srunner_add_suite(sr, geis1_instance_suite_new());
+  srunner_add_suite(sr, geis1_gesture_types_new());
   srunner_add_suite(sr, geis1_gesture_attrs_new());
 
   srunner_set_log(sr, "geis1_api.log");

=== added file 'testsuite/geis1/check_gesture_types.c'
--- testsuite/geis1/check_gesture_types.c	1970-01-01 00:00:00 +0000
+++ testsuite/geis1/check_gesture_types.c	2011-03-28 12:59:24 +0000
@@ -0,0 +1,77 @@
+/**
+ * @file check_gesture_types.c
+ * @brief Unit tests for GEIS v1 gesture types
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This library 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 Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+#include <check.h>
+
+#include <geis/geis.h>
+
+
+START_TEST(gesture_types)
+{
+  GeisInteger geis_type;
+  GeisString  geis_type_name;
+
+  geis_type = GEIS_GESTURE_PRIMITIVE_DRAG;
+  geis_type = GEIS_GESTURE_PRIMITIVE_PINCH;
+  geis_type = GEIS_GESTURE_PRIMITIVE_ROTATE;
+  geis_type = GEIS_GESTURE_PRIMITIVE_TAP;
+  geis_type = GEIS_GESTURE_PRIMITIVE_TOUCH;
+
+  geis_type_name = GEIS_GESTURE_TYPE_DRAG1;
+  geis_type_name = GEIS_GESTURE_TYPE_DRAG2;
+  geis_type_name = GEIS_GESTURE_TYPE_DRAG3;
+  geis_type_name = GEIS_GESTURE_TYPE_DRAG4;
+  geis_type_name = GEIS_GESTURE_TYPE_DRAG5;
+  geis_type_name = GEIS_GESTURE_TYPE_PINCH1;
+  geis_type_name = GEIS_GESTURE_TYPE_PINCH2;
+  geis_type_name = GEIS_GESTURE_TYPE_PINCH3;
+  geis_type_name = GEIS_GESTURE_TYPE_PINCH4;
+  geis_type_name = GEIS_GESTURE_TYPE_PINCH5;
+  geis_type_name = GEIS_GESTURE_TYPE_ROTATE1;
+  geis_type_name = GEIS_GESTURE_TYPE_ROTATE2;
+  geis_type_name = GEIS_GESTURE_TYPE_ROTATE3;
+  geis_type_name = GEIS_GESTURE_TYPE_ROTATE4;
+  geis_type_name = GEIS_GESTURE_TYPE_ROTATE5;
+  geis_type_name = GEIS_GESTURE_TYPE_TAP1;
+  geis_type_name = GEIS_GESTURE_TYPE_TAP2;
+  geis_type_name = GEIS_GESTURE_TYPE_TAP3;
+  geis_type_name = GEIS_GESTURE_TYPE_TAP4;
+  geis_type_name = GEIS_GESTURE_TYPE_TAP5;
+  geis_type_name = GEIS_GESTURE_TYPE_TOUCH1;
+  geis_type_name = GEIS_GESTURE_TYPE_TOUCH2;
+  geis_type_name = GEIS_GESTURE_TYPE_TOUCH3;
+  geis_type_name = GEIS_GESTURE_TYPE_TOUCH4;
+  geis_type_name = GEIS_GESTURE_TYPE_TOUCH5;
+}
+END_TEST
+
+Suite *
+geis1_gesture_types_new()
+{
+  Suite *s = suite_create("geis1_gesture_types");
+  TCase *test;
+
+  test = tcase_create("gesture_types");
+  tcase_add_test(test, gesture_types);
+  suite_add_tcase(s, test);
+
+  return s;
+}
+

=== modified file 'testsuite/geistest/geistest.c'
--- testsuite/geistest/geistest.c	2011-03-22 16:35:35 +0000
+++ testsuite/geistest/geistest.c	2011-03-28 12:59:24 +0000
@@ -33,6 +33,7 @@
   GEIS_GESTURE_TYPE_PINCH2, GEIS_GESTURE_TYPE_PINCH3,
   GEIS_GESTURE_TYPE_ROTATE2, GEIS_GESTURE_TYPE_ROTATE3,
   GEIS_GESTURE_TYPE_TAP2, GEIS_GESTURE_TYPE_TAP3, GEIS_GESTURE_TYPE_TAP4,
+  GEIS_GESTURE_TYPE_TOUCH3, GEIS_GESTURE_TYPE_TOUCH4,
   NULL
 };