← Back to branch summary

~chasedouglas/grail/work-in-progress

~chasedouglas/grail/work-in-progress

« back to all changes in this revision

Viewing changes to src/v3/gesture.h

Committer: Chase Douglas
Date: 2012-03-19 16:55:49 UTC
mfrom: (199.1.5 gesture-end-fix)
Revision ID: chase.douglas@ubuntu.com-20120319165549-n0orytbxe1rd0a3x

https://launchpad.net/bugs/957437

https://launchpad.net/bugs/949855

Merge fixes for atomic gesture timeout handling and gesture end handling

files added:
test/recordings/apple_magic_trackpad

test/recordings/ntrig_dell_xt2

test/recordings/ntrig_dell_xt2/2_tap.record

test/x11/atomic-timeout.cpp

files renamed:
test/recordings/apple-wtrackpad-4fingers-drag.event => test/recordings/apple_magic_trackpad/4_drag.record

test/recordings/apple-wireless-trackpad.prop => test/recordings/apple_magic_trackpad/device.prop

test/recordings/apple-wtrackpad-synced-4-drag.event => test/recordings/apple_magic_trackpad/synced_4_drag.record

test/recordings/ntrig-2-drag.event => test/recordings/ntrig_dell_xt2/2_drag.record

test/recordings/ntrig-dell-xt2.prop => test/recordings/ntrig_dell_xt2/device.prop

test/recordings/ntrig-drag-above-thresh.event => test/recordings/ntrig_dell_xt2/drag_above_thresh.record

test/recordings/ntrig-drag-below-thresh.event => test/recordings/ntrig_dell_xt2/drag_below_thresh.record

test/recordings/ntrig-timeout.event => test/recordings/ntrig_dell_xt2/timeout.record

files modified:
src/v3/atomic-recognizer.cpp

src/v3/atomic-recognizer.h

src/v3/gesture.cpp

src/v3/gesture.h

src/v3/recognizer.h

src/v3/slice.cpp

src/v3/slice.h

test/Makefile.am

test/x11/dragthresh.cpp

test/x11/no-premature-gestures.cpp

test/x11/no-tap-after-drag.cpp

test/x11/timeout.cpp

test/x11/twodrag.cpp

Show diffs side-by-side

added added

removed removed

src/v3/gesture.h

47

47

void Update(UFEvent event, TouchSet& touches);

48

48

bool IsActive() const;

49

49

bool IsConstructionFinished() const;

50

bool IsPhysicallyEnded() const;

50

51

void FinishConstruction();

51

52

uint64_t Timeout() const;

52

53

float AngleForTouch(UFTouchId touch_id) const;

Older »