aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/input.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-12-03 09:16:19 +0100
committermarha <marha@users.sourceforge.net>2012-12-03 09:16:19 +0100
commit17464545a9abdd19312065a578d1f69a6b0b015f (patch)
treed39fde94a445ddde95399d4850ffbbbd357a3a19 /xorg-server/include/input.h
parenteba14241fe23d0561687a1e530a57fa0bfc6ab69 (diff)
parentb8da71ffb17d3d16706db04115e9ba1dd8bc49b9 (diff)
downloadvcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.tar.gz
vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.tar.bz2
vcxsrv-17464545a9abdd19312065a578d1f69a6b0b015f.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012
Diffstat (limited to 'xorg-server/include/input.h')
-rw-r--r--xorg-server/include/input.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index f8459b8c8..2387dbf4a 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/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);