lp:~thomas-voss/grail/rework_cosmetics

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~chasedouglas/grail/rework

Stephen M. Webb (community): Needs Fixing on 2011-11-03

Chase Douglas: Pending requested 2011-11-01

Diff: 4720 lines (+2413/-2104)

13 files modified

include/utouch/grail.h (+7/-7)
src/v3/event.cpp (+55/-36)
src/v3/event.h (+24/-19)
src/v3/gesture.cpp (+246/-181)
src/v3/gesture.h (+42/-45)
src/v3/handle.cpp (+345/-313)
src/v3/handle.h (+39/-40)
src/v3/recognizer.cpp (+539/-490)
src/v3/recognizer.h (+40/-53)
src/v3/slice.cpp (+688/-551)
src/v3/slice.h (+57/-65)
src/v3/subscription.cpp (+288/-250)
src/v3/subscription.h (+43/-54)

api

Rejected for merging into lp:grail

Jussi Pakkanen (community): Needs Fixing on 2011-11-01

Diff: 11075 lines (+7924/-2754) (has conflicts)

67 files modified

configure.ac (+5/-2)
include/utouch/grail.h (+628/-0)
src/Makefile.am (+41/-21)
src/evbuf.h (+0/-57)
src/gebuf.h (+0/-68)
src/gestures-drag.c (+0/-135)
src/gestures-pinch.c (+0/-131)
src/gestures-rotate.c (+0/-130)
src/gestures-tapping.c (+0/-100)
src/gestures-touch.c (+0/-98)
src/grail-api.c (+0/-328)
src/grail-bits.c (+0/-93)
src/grail-event.c (+0/-118)
src/grail-frame.c (+0/-410)
src/grail-gestures.h (+0/-115)
src/grail-impl.h (+0/-88)
src/grail-init.c (+0/-236)
src/grail-inserter.c (+0/-304)
src/grail-inserter.h (+0/-93)
src/grail-legacy.c (+0/-64)
src/grail-recognizer.c (+0/-58)
src/grail-recognizer.h (+0/-44)
src/grailbuf.h (+0/-59)
src/v2/evbuf.h (+57/-0)
src/v2/gebuf.h (+68/-0)
src/v2/gestures-drag.c (+135/-0)
src/v2/gestures-pinch.c (+131/-0)
src/v2/gestures-rotate.c (+130/-0)
src/v2/gestures-tapping.c (+100/-0)
src/v2/gestures-touch.c (+98/-0)
src/v2/grail-api.c (+328/-0)
src/v2/grail-bits.c (+93/-0)
src/v2/grail-event.c (+118/-0)
src/v2/grail-frame.c (+410/-0)
src/v2/grail-gestures.c (+223/-0)
src/v2/grail-gestures.h (+115/-0)
src/v2/grail-impl.h (+88/-0)
src/v2/grail-init.c (+236/-0)
src/v2/grail-inserter.c (+304/-0)
src/v2/grail-inserter.h (+93/-0)
src/v2/grail-legacy.c (+64/-0)
src/v2/grail-recognizer.c (+58/-0)
src/v2/grail-recognizer.h (+44/-0)
src/v2/grailbuf.h (+59/-0)
src/v3/event.cpp (+91/-0)
src/v3/event.h (+54/-0)
src/v3/gesture.cpp (+278/-0)
src/v3/gesture.h (+76/-0)
src/v3/handle.cpp (+379/-0)
src/v3/handle.h (+73/-0)
src/v3/recognizer.cpp (+575/-0)
src/v3/recognizer.h (+75/-0)
src/v3/slice.cpp (+718/-0)
src/v3/slice.h (+87/-0)
src/v3/subscription.cpp (+323/-0)
src/v3/subscription.h (+72/-0)
tools/Makefile.am (+29/-1)
tools/common/device.c (+188/-0)
tools/common/device.h (+28/-0)
tools/common/servertime.c (+84/-0)
tools/common/servertime.h (+30/-0)
tools/common/slice.c (+91/-0)
tools/common/slice.h (+24/-0)
tools/grail-eventprinter.c (+1/-1)
tools/grail-test-3-1.c (+342/-0)
tools/grail-test-edge.c (+356/-0)
tools/grail-test-propagation.c (+324/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

241. By Thomas Voß on 2011-10-31

Modified: Reverted changes to initialization of limits.

240. By Thomas Voß on 2011-10-31

Cleaned up v3, introduced utouch::grail namespace and PIMPL-ed classes.

239. By Chase Douglas on 2011-10-21

Fix logic for checking touch ending in UGSlice_::CheckGestureEnd()

238. By Chase Douglas on 2011-10-20

Reset original values and transformations when touch count changes

Also, remove a block of dead code that checked for removed touches. This
is now done in the Gesture class.

237. By Chase Douglas on 2011-10-20

Handle touch pending end state appropriately

This fixes tapping recognition

236. By Chase Douglas on 2011-10-20

Check for pending events after XSync

Otherwise, some events may be read into libx11, and there will be no more
data to be read from the X connection itself. At this point, more events
are needed to activate the file descriptor so events are read.

235. By Chase Douglas on 2011-10-20

Fix event times for update and end slices

234. By Chase Douglas on 2011-10-20

Default to max and min touches equal to start touches

Previously, max and min defaulted to 2 touches, no matter was the start
touches was.

233. By Chase Douglas on 2011-10-20

grail-test-edge: Add missing return in error path

232. By Chase Douglas on 2011-10-19

Don't remove ended touches from gestures until they are used in a slice