lp:~dandrader/grail/lp960598

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:grail at revision 203

Chase Douglas (community): Approve on 2012-03-21

Diff: 2741 lines (+2688/-5)

6 files modified

src/v3/atomic-recognizer.cpp (+6/-4)
test/Makefile.am (+4/-1)
test/recordings/apple_magic_trackpad/3_drag_ended_by_4th_touch.record (+1896/-0)
test/slice-checker.cpp (+186/-0)
test/slice-checker.h (+203/-0)
test/x11/parallel-atomic-gestures.cpp (+393/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #960598: utouch-grail aborts when there are multiple accepted atomic gestures

Medium

Fix Released

Link a bug report

Related blueprints

203. By Daniel d'Andrada on 2012-03-21

Test for parallel atomic gestures

Also serves as a way to document the behavior of atomic gestures rules.

The test is not strict in the exact number, content or order of slices
produced for the given input. It just checks that the slices come in an
order that makes sense:
 - "Begin" comes before "Update" which comes before "End"
 - "Construction finished == false" comes before "Construction finished == true"
 - Touch slices comes before Drag slices (since a Touch gesture is recognized
    earlier than a Drag)
 - No Pinch slices come out of a physical drag gesture.

202. By Daniel d'Andrada on 2012-03-20

Under atomic gestures rules there can be more than one accepted gesture

The requirement is that each gesture must take all available touches, but more
than one can be accepted in parallel.

201. By Chase Douglas on 2012-03-20

Merge fixes for symbol visibility, compile flag usage, and test building

200. By Chase Douglas on 2012-03-19

Merge fixes for atomic gesture timeout handling and gesture end handling

199. By Daniel d'Andrada on 2012-03-14

Make code follow Google C++ coding style

198. By Chase Douglas on 2012-03-14

Merge test fixes branch

This ensures make check will not fail if xorg-gtest is not available.
There are other problems with the testing, which are apparent when
running make distcheck. Those will be fixed up in future branches.

197. By Daniel d'Andrada on 2012-03-14

Merge "Atomic rules: Don't send slices from premature gestures."

+ refactoring of v3/Recognizer
+ regression test

196. By Daniel d'Andrada on 2012-03-14

Merged "Erase ended touches from start_times_ map"

195. By Daniel d'Andrada on 2012-03-12

Merge "A touch cannot be accepted and unaccepted simultaneously."

194. By Daniel d'Andrada on 2012-03-09

Updated .bzrignore