diff options
author | Keith Packard <keithp@keithp.com> | 2012-11-30 09:31:46 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2012-11-30 09:31:46 -0800 |
commit | b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 (patch) | |
tree | d9e9e63f5a407f674a051b40ec94818bb5b70aad /include/input.h | |
parent | e9ea96d6a88f197928c82b008953f1810de6f792 (diff) | |
parent | ce6b6529290f7d42717aad3fd8a83aaaaf8962de (diff) |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'include/input.h')
-rw-r--r-- | include/input.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/input.h b/include/input.h index f8459b8c8..2387dbf4a 100644 --- a/include/input.h +++ b/include/input.h @@ -465,6 +465,11 @@ extern int GetTouchOwnershipEvents(InternalEvent *events, TouchPointInfoPtr ti, uint8_t mode, XID resource, uint32_t flags); +extern void GetDixTouchEnd(InternalEvent *ievent, + DeviceIntPtr dev, + TouchPointInfoPtr ti, + uint32_t flags); + extern _X_EXPORT int GetProximityEvents(InternalEvent *events, DeviceIntPtr pDev, int type, const ValuatorMask *mask); @@ -580,6 +585,8 @@ extern int TouchListenerAcceptReject(DeviceIntPtr dev, TouchPointInfoPtr ti, extern int TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode, uint32_t touchid, Window grab_window, XID *error); extern void TouchEndPhysicallyActiveTouches(DeviceIntPtr dev); +extern void TouchDeliverDeviceClassesChangedEvent(TouchPointInfoPtr ti, + Time time, XID resource); /* misc event helpers */ extern Mask GetEventMask(DeviceIntPtr dev, xEvent *ev, InputClientsPtr clients); |