diff options
| author | Keith Packard <keithp@keithp.com> | 2012-04-19 10:45:07 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-04-19 10:45:07 -0500 |
| commit | e6308e32fe2b5f74133d4d238ffa512257f6327c (patch) | |
| tree | 48f4dacae7b6e51491c5ba54d19bbeab2730f90d /include | |
| parent | 3720aa33ee50788dd3d4acc9bbf8dfcb72c8f5ce (diff) | |
| parent | 51a8d8dd19d7496fe84b37a1f0a7a03658120539 (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Touch input changes from Chase
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/input.h b/include/input.h index d891fe5db..991d64813 100644 --- a/include/input.h +++ b/include/input.h @@ -563,8 +563,8 @@ extern void TouchAddListener(TouchPointInfoPtr ti, XID resource, extern Bool TouchRemoveListener(TouchPointInfoPtr ti, XID resource); extern void TouchSetupListeners(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev); -extern Bool TouchEnsureSprite(DeviceIntPtr sourcedev, TouchPointInfoPtr ti, - InternalEvent *ev); +extern Bool TouchBuildSprite(DeviceIntPtr sourcedev, TouchPointInfoPtr ti, + InternalEvent *ev); extern Bool TouchBuildDependentSpriteTrace(DeviceIntPtr dev, SpritePtr sprite); extern int TouchConvertToPointerEvent(const InternalEvent *ev, InternalEvent *motion, @@ -572,6 +572,8 @@ extern int TouchConvertToPointerEvent(const InternalEvent *ev, extern int TouchGetPointerEventType(const InternalEvent *ev); extern void TouchRemovePointerGrab(DeviceIntPtr dev); extern void TouchListenerGone(XID resource); +extern int TouchListenerAcceptReject(DeviceIntPtr dev, TouchPointInfoPtr ti, + int listener, int mode); extern int TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode, uint32_t touchid, Window grab_window, XID *error); |