aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/input.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-08-18 10:36:39 +0000
committermarha <marha@users.sourceforge.net>2010-08-18 10:36:39 +0000
commit07d3578ce63d87c9a87d54d85f5c8057d30fdc58 (patch)
treed8acfcb63e11aa7f91c1d9685b5c2f55cd7133c7 /xorg-server/include/input.h
parent4d025671124c9f6d91c1c165fc892b1609fdce12 (diff)
parent2aa7bcf37f00b7884ae166d62db81493ea37934a (diff)
downloadvcxsrv-07d3578ce63d87c9a87d54d85f5c8057d30fdc58.tar.gz
vcxsrv-07d3578ce63d87c9a87d54d85f5c8057d30fdc58.tar.bz2
vcxsrv-07d3578ce63d87c9a87d54d85f5c8057d30fdc58.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include/input.h')
-rw-r--r--xorg-server/include/input.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index 33b94fd3e..1930a308b 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -439,6 +439,12 @@ extern void CreateClassesChangedEvent(EventListPtr event,
DeviceIntPtr master,
DeviceIntPtr slave,
int type);
+extern EventListPtr UpdateFromMaster(
+ EventListPtr events,
+ DeviceIntPtr pDev,
+ int type,
+ int *num_events);
+
extern _X_EXPORT int GetPointerEvents(
EventListPtr events,
DeviceIntPtr pDev,