Geis

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

  1. lp-740284
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Merged at revision: 121
Proposed branch: lp:~bregma/geis/lp-740284
Merge into: lp:geis
Prerequisite: lp:~bregma/geis/lp-737745
Diff against target: 69 lines (+16/-6)
3 files modified
ChangeLog (+11/-1)
libutouch-geis/backend/xcb/geis_xcb_backend.c (+2/-2)
testsuite/geistest/geistest.c (+3/-3)
To merge this branch: bzr merge lp:~bregma/geis/lp-740284
Reviewer Review Type Date Requested Status
Chase Douglas (community) Approve
Henrik Rydberg (community) Approve
Review via email: mp+54381@code.launchpad.net

Description of the change

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

Fixes LP: #740284.

To post a comment you must log in.
Revision history for this message
Henrik Rydberg (rydberg) wrote :

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

review: Approve
Revision history for this message
Chase Douglas (chasedouglas) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-03-22 16:41:07 +0000
3+++ ChangeLog 2011-03-22 16:41:07 +0000
4@@ -1,6 +1,16 @@
5 2011-03-22 Stephen M. Webb <stephen.webb@canonical.com>
6
7- Corrected the number of touches on a gesture event (LP: #737745)
8+ Passed the correct gesture_id to GEIS v1 callbacks (LP: #740284).
9+
10+ * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
11+ Used the grail gesture_id as the frame_id.
12+ * testsuite/geistest/geistest.c (gesture_update): reported the gesture_id
13+ (gesture_start): reported the gesture_id
14+ (gesture_finish): reported the gesture_id
15+
16+2011-03-22 Stephen M. Webb <stephen.webb@canonical.com>
17+
18+ Corrected the number of touches on a gesture event (LP: #737745).
19
20 * libutouch-geis/backend/xcb/geis_xcb_backend.c (_dispatch_gesture):
21 replaced geis_xcb_backend_touch_count() call with a calculation based on
22
23=== modified file 'libutouch-geis/backend/xcb/geis_xcb_backend.c'
24--- libutouch-geis/backend/xcb/geis_xcb_backend.c 2011-03-22 16:41:07 +0000
25+++ libutouch-geis/backend/xcb/geis_xcb_backend.c 2011-03-22 16:41:07 +0000
26@@ -227,10 +227,10 @@
27 GeisGroup group = geis_group_new(1);
28 geis_groupset_insert(groupset, group);
29
30- GeisFrame frame = geis_frame_new(1);
31+ GeisFrame frame = geis_frame_new(grail_event->gesture_id);
32 geis_group_insert_frame(group, frame);
33
34- GeisAttr attr = NULL;;
35+ GeisAttr attr = NULL;
36
37 GeisInteger ival = grail_event->device_id;
38 attr = geis_attr_new(GEIS_GESTURE_ATTRIBUTE_DEVICE_ID,
39
40=== modified file 'testsuite/geistest/geistest.c'
41--- testsuite/geistest/geistest.c 2011-03-13 04:25:45 +0000
42+++ testsuite/geistest/geistest.c 2011-03-22 16:41:07 +0000
43@@ -123,7 +123,7 @@
44 GeisGestureAttr *attrs)
45 {
46 int i = 0;
47- fprintf(stdout, "Gesture type %d started\n", gesture_type);
48+ fprintf(stdout, "Gesture id %d type %d started\n", gesture_id, gesture_type);
49 for (i = 0; i < attr_count; ++i)
50 print_attr(&attrs[i]);
51 }
52@@ -136,7 +136,7 @@
53 GeisGestureAttr *attrs)
54 {
55 int i = 0;
56- fprintf(stdout, "Gesture type %d updated\n", gesture_type);
57+ fprintf(stdout, "Gesture id %d type %d updated\n", gesture_id, gesture_type);
58 for (i = 0; i < attr_count; ++i)
59 print_attr(&attrs[i]);
60 }
61@@ -149,7 +149,7 @@
62 GeisGestureAttr *attrs)
63 {
64 int i = 0;
65- fprintf(stdout, "Gesture type %d finished\n", gesture_type);
66+ fprintf(stdout, "Gesture id %d type %d finished\n", gesture_id, gesture_type);
67 for (i = 0; i < attr_count; ++i)
68 print_attr(&attrs[i]);
69 }

Subscribers

People subscribed via source and target branches