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

[Stephen M. Webb]

Causes the grail gesture_id to be reported via the GEIS v1 API.

Fixes LP: #740284.

[Henrik Rydberg (rydberg)]

It is nice when the problem is of this kind, and the fix so obvious :-)

review: Approve

[Chase Douglas (chasedouglas)]

Test unit would be nice again, but not necessary right now.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-03-22 16:41:07 +0000
+++ ChangeLog	2011-03-22 16:41:07 +0000
@@ -1,6 +1,16 @@
 2011-03-22  Stephen M. Webb  <[e-mail]>
 
-  Corrected the number of touches on a gesture event (LP: #737745)
+  Passed the correct gesture_id to GEIS v1 callbacks (LP: #740284).
+
+  * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
+    Used the grail gesture_id as the frame_id.
+  * testsuite/geistest/geistest.c (gesture_update): reported the gesture_id
+    (gesture_start): reported the gesture_id
+    (gesture_finish): reported the gesture_id
+
[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
 
=== modified file 'libutouch-geis/backend/xcb/geis_xcb_backend.c'
--- libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-03-22 16:41:07 +0000
+++ libutouch-geis/backend/xcb/geis_xcb_backend.c	2011-03-22 16:41:07 +0000
@@ -227,10 +227,10 @@
   GeisGroup group = geis_group_new(1);
   geis_groupset_insert(groupset, group);
 
-  GeisFrame frame = geis_frame_new(1);
+  GeisFrame frame = geis_frame_new(grail_event->gesture_id);
   geis_group_insert_frame(group, frame);
 
-  GeisAttr attr = NULL;;
+  GeisAttr attr = NULL;
 
   GeisInteger ival = grail_event->device_id;
   attr = geis_attr_new(GEIS_GESTURE_ATTRIBUTE_DEVICE_ID,
 
=== modified file 'testsuite/geistest/geistest.c'
--- testsuite/geistest/geistest.c	2011-03-13 04:25:45 +0000
+++ testsuite/geistest/geistest.c	2011-03-22 16:41:07 +0000
@@ -123,7 +123,7 @@
 	      GeisGestureAttr   *attrs)
 {
   int i = 0;
-  fprintf(stdout, "Gesture type %d started\n", gesture_type);
+  fprintf(stdout, "Gesture id %d type %d started\n", gesture_id, gesture_type);
   for (i = 0; i < attr_count; ++i)
     print_attr(&attrs[i]);
 }
@@ -136,7 +136,7 @@
 	       GeisGestureAttr   *attrs)
 {
   int i = 0;
-  fprintf(stdout, "Gesture type %d updated\n", gesture_type);
+  fprintf(stdout, "Gesture id %d type %d updated\n", gesture_id, gesture_type);
   for (i = 0; i < attr_count; ++i)
     print_attr(&attrs[i]);
 }
@@ -149,7 +149,7 @@
 	       GeisGestureAttr   *attrs)
 {
   int i = 0;
-  fprintf(stdout, "Gesture type %d finished\n", gesture_type);
+  fprintf(stdout, "Gesture id %d type %d finished\n", gesture_id, gesture_type);
   for (i = 0; i < attr_count; ++i)
     print_attr(&attrs[i]);
 }