diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-21 07:48:16 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-21 07:48:16 +0200 |
| commit | c665b6e88274f8bc603b0f14f92bf09d2023bd4d (patch) | |
| tree | e6b3c81a76d0cc2df868263aeae0ab045eaf45b4 /xorg-server/include | |
| parent | 91e353434f0a6859f404be05581f44d009ca5d6c (diff) | |
| parent | 6d895f30ab93d71afddc612d8b007f2de7f04165 (diff) | |
| download | vcxsrv-c665b6e88274f8bc603b0f14f92bf09d2023bd4d.tar.gz vcxsrv-c665b6e88274f8bc603b0f14f92bf09d2023bd4d.tar.bz2 vcxsrv-c665b6e88274f8bc603b0f14f92bf09d2023bd4d.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver xkeyboard-config git update 21 okt 2013
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/dix.h | 11 | ||||
| -rw-r--r-- | xorg-server/include/dixstruct.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h index 171e56e11..fa7ccd4a3 100644 --- a/xorg-server/include/dix.h +++ b/xorg-server/include/dix.h @@ -315,8 +315,19 @@ extern _X_EXPORT WindowPtr GetSpriteWindow(DeviceIntPtr pDev); extern _X_EXPORT void +NoticeTime(const DeviceIntPtr dev, + TimeStamp time); +extern _X_EXPORT void NoticeEventTime(InternalEvent *ev, DeviceIntPtr dev); +extern _X_EXPORT TimeStamp +LastEventTime(int deviceid); +extern _X_EXPORT Bool +LastEventTimeWasReset(int deviceid); +extern _X_EXPORT void +LastEventTimeToggleResetFlag(int deviceid, Bool state); +extern _X_EXPORT void +LastEventTimeToggleResetAll(Bool state); extern void EnqueueEvent(InternalEvent * /* ev */ , diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h index 7226760e9..7065b0456 100644 --- a/xorg-server/include/dixstruct.h +++ b/xorg-server/include/dixstruct.h @@ -144,7 +144,6 @@ typedef struct _WorkQueue { } WorkQueueRec; extern _X_EXPORT TimeStamp currentTime; -extern _X_EXPORT TimeStamp lastDeviceEventTime[MAXDEVICES]; extern _X_EXPORT int CompareTimeStamps(TimeStamp /*a */ , |