Grail

Merge lp://staging/~oif-team/grail/grail2 into lp://staging/grail

  1. grail2
  2. Merge into trunk
Proposed by Henrik Rydberg
Status: Superseded
Proposed branch: lp://staging/~oif-team/grail/grail2
Merge into: lp://staging/grail
Diff against target: 2628 lines (+1991/-155)
36 files modified
AUTHORS (+1/-0)
configure.ac (+8/-1)
docs/gestures.txt (+18/-0)
docs/pivot.txt (+144/-0)
include/grail-bits.h (+1/-2)
include/grail-types.h (+1/-2)
include/grail.h (+247/-49)
src/Makefile.am (+4/-1)
src/evbuf.h (+16/-23)
src/gebuf.h (+1/-2)
src/gestures-drag.c (+1/-2)
src/gestures-pinch.c (+1/-2)
src/gestures-rotate.c (+1/-2)
src/gestures-tapping.c (+1/-2)
src/grail-api.c (+16/-13)
src/grail-bits.c (+1/-2)
src/grail-event.c (+1/-27)
src/grail-frame.c (+387/-0)
src/grail-gestures.c (+1/-2)
src/grail-gestures.h (+1/-2)
src/grail-impl.h (+40/-3)
src/grail-init.c (+240/-0)
src/grail-inserter.c (+1/-2)
src/grail-inserter.h (+1/-2)
src/grail-legacy.c (+65/-0)
src/grail-recognizer.c (+1/-2)
src/grail-recognizer.h (+1/-2)
src/grailbuf.h (+1/-2)
test/Makefile.am (+1/-0)
test/check-grail.c (+2/-0)
test/check-transform.c (+137/-0)
tools/Makefile.am (+12/-4)
tools/grail-gesture.c (+1/-4)
tools/grail-test-mtdev.c (+256/-0)
tools/grail-transform.c (+374/-0)
utouch-grail.sym.in (+6/-0)
To merge this branch: bzr merge lp://staging/~oif-team/grail/grail2
Reviewer Review Type Date Requested Status
Open Input Framework Team Pending
Review via email: mp+55295@code.staging.launchpad.net

This proposal supersedes a proposal from 2011-03-29.

This proposal has been superseded by a proposal from 2011-04-05.

Description of the change

Rebased grail2 starter kit, this could go in trunk now.

To post a comment you must log in.
lp://staging/~oif-team/grail/grail2 updated
139. By Chase Douglas

Merge send-key-events branch for better semi-mt support.

140. By Henrik Rydberg

Do not discard a started gesture

Not all discarding code paths were taking the notion of a started
gesture into account. Specifically, switching to a gesture of higher
priority would leave the old gesture without a finish. Fixed with
this patch.

Note that timeout implies not sent, so all discarding code paths
are now covered.

Signed-off-by: Henrik Rydberg <email address hidden>

141. By Henrik Rydberg

Glue touch gestures as well

All motion-activated gestures are held for a short (glue) time
to allow for direct transition to multi-finger gesture types.
The touch gestures were mistakenly implemented without this.
Fixed with this patch. LP: #748282

Signed-off-by: Henrik Rydberg <email address hidden>

142. By Chase Douglas

Merge branch to remove the EWMA move filter

143. By Jussi Pakkanen

Merged visibility fixes.

144. By Jussi Pakkanen

Merged C++ header fix.

145. By Jussi Pakkanen

Merge Pkg-config fix.

146. By Henrik Rydberg

Fixup remaining C++ and public function declarations

The grail-bits.h file can be included on its own, so it needs
the same handling. To save files in public name space, move the
visibility declarations to grail-bits.h, and include it as a main
file from grail.h.

Signed-off-by: Henrik Rydberg <email address hidden>

147. By Jussi Pakkanen

Merged Clang cleanups.

148. By Henrik Rydberg

Expose utouch-frame through grail API

Start a gentle API change by exposing utouch-frame through grail,
and deprecating the grail_contact struct. Old programs compile and
run fine. To only use the new api, compile with -DGRAIL_NO_LEGACY_API.

Signed-off-by: Henrik Rydberg <email address hidden>

149. By Henrik Rydberg

Prepare for gesture frame additions

Rename internal variables and fix makefile to make room for new
targets.

Signed-off-by: Henrik Rydberg <email address hidden>

150. By Henrik Rydberg

Introduce gesture frames

This patch extends the API with parallel new/delete functions,
aiming to eventually replace the open/close function. The new
functions give access to the grail gesture frames, containing
gestural transform information. This information is useful in its
own right, and will eventually replace the internal recognizer.

Signed-off-by: Henrik Rydberg <email address hidden>

151. By Henrik Rydberg

Document the gesture frame logic

Add some notes on the math of the gesture frame computations.

Signed-off-by: Henrik Rydberg <email address hidden>

152. By Henrik Rydberg

Add gesture transform unit tests

Start the gesture frame test suite with some basic coordinate
mapping tests.

Signed-off-by: Henrik Rydberg <email address hidden>

153. By Henrik Rydberg

Introduce test-mtdev

A new tool (test-mtdev) is added, showing the usage of gesture frames.

Signed-off-by: Henrik Rydberg <email address hidden>

154. By Henrik Rydberg

Introduce the grail transform tool

This tool tests the transform capabilities of grail. Similar to a
map application, one can use a single finger, two fingers, a whole
hand or two hands to move the rectangle around, scale and rotate it.

Signed-off-by: Henrik Rydberg <email address hidden>

155. By Henrik Rydberg

Update copyright information

The license information was always right, but the copyright information
for this particular project was never quite right. Corrected with this
patch. No functional changes.

Signed-off-by: Henrik Rydberg <email address hidden>

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: