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

[Stephen M. Webb]

Corrects the gesture touch count to reflect the number of touches returned from grail.

[Chase Douglas (chasedouglas)]

Looks good to me. Probably should have a test unit, but we're crunched on time.

review: Approve

[Henrik Rydberg (rydberg)]

Same here.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-03-17 23:42:48 +0000
+++ ChangeLog	2011-03-22 16:16:31 +0000
@@ -1,3 +1,15 @@
[phone]  Stephen M. Webb  <[e-mail]>
+
+  Corrected the number of touches on a gesture event (LP: #737745)
+
+  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
+    replaced geis_xcb_backend_touch_count() call with a calculation based on
+    the number of touch properties passed from grail
+  * libutouch-geis/backend/xcb/grail_gestures.c (geis_xcb_backend_touch_count):
+    removed
+  * libutouch-geis/backend/xcb/grail_gestures.h (geis_xcb_backend_touch_count):
+    removed
+
 2011-03-17  Stephen M. Webb  <[e-mail]>
 
   Added definitions for GEIS v1 gesture primitive types (LP: #737230).

=== modified file 'libutouch-geis/backend/xcb/geis_xcb_backend.c'
--- libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-03-16 22:12:42 +0000
+++ libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-03-22 16:16:31 +0000
@@ -206,6 +206,7 @@
   float        *properties = (float *)(grail_event + 1);
   GeisSize      num_properties = grail_event->num_props;
   GeisSize      num_unmapped_properties = num_properties;
+  GeisSize      touch_count;
 
   geis_attr_set_destructor(group_attr, (GeisAttrDestructor)geis_groupset_delete);
   geis_attr_set_destructor(touch_attr, (GeisAttrDestructor)geis_touchset_delete);
@@ -271,18 +272,18 @@
                        &grail_event->focus_y);
   geis_frame_add_attr(frame, attr);
 
-  GeisSize touch_count = geis_xcb_backend_touch_count(grail_event->gesture_type);
+  num_unmapped_properties = geis_xcb_backend_map_grail_attrs(
+                                   grail_event->gesture_type,
+                                   num_properties, properties, frame);
+
+  /* any remaining properties are touch properties */
+  touch_count = (num_properties - num_unmapped_properties) / 3;
+  properties += touch_count * 3;
   attr = geis_attr_new(GEIS_GESTURE_ATTRIBUTE_TOUCHES,
                        GEIS_ATTR_TYPE_INTEGER,
                        &touch_count);
   geis_frame_add_attr(frame, attr);
 
-  num_unmapped_properties = geis_xcb_backend_map_grail_attrs(
-				   grail_event->gesture_type,
-				   num_properties, properties, frame);
-
-  /* any remaining properties are touch properties */
-  properties += (num_properties - num_unmapped_properties);
   GeisSize i;
   for (i = 0; i < touch_count; ++i)
   {

=== modified file 'libutouch-geis/backend/xcb/grail_gestures.c'
--- libutouch-geis/backend/xcb/grail_gestures.c	2011-03-17 23:42:48 +0000
+++ libutouch-geis/backend/xcb/grail_gestures.c	2011-03-22 16:16:31 +0000
@@ -342,23 +342,6 @@
 
 
 GeisSize
-geis_xcb_backend_touch_count(GeisInteger grail_type)
-{
-  const GrailClassMap *grail_class;
-  for (grail_class = s_grail_class_map;
-       grail_class->geis_class_id >= 0;
-       ++grail_class)
-  {
-    if (grail_class->grail_type == grail_type)
-    {
-      return grail_class->touch_count;
-    }
-  }
-  return 0;
-}
-
-
-GeisSize
 geis_xcb_backend_map_grail_attrs(GeisInteger grail_type,
                                  GeisSize    num_properties,
                                  float      *properties,

=== modified file 'libutouch-geis/backend/xcb/grail_gestures.h'
--- libutouch-geis/backend/xcb/grail_gestures.h	2011-02-17 18:16:05 +0000
+++ libutouch-geis/backend/xcb/grail_gestures.h	2011-03-22 16:16:31 +0000
@@ -31,8 +31,6 @@
 
 GeisInteger geis_xcb_backend_primitive_class(GeisInteger grail_gesture_type);
 
-GeisSize geis_xcb_backend_touch_count(GeisInteger grail_gesture_type);
-
 GeisSize geis_xcb_backend_map_grail_attrs(GeisInteger grail_type,
                                           GeisSize    num_properties,
                                           float      *properties,