diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
| commit | 9818207986d5db9831e43eb2a640be68f54bb2ef (patch) | |
| tree | e1ac6d17b2da887a2110c1337f01fc6fbdfa68fd /xorg-server/dix | |
| parent | e6ff1fe09702cb307729b3208175c84f623f2968 (diff) | |
| parent | 062c45ff0df6a52080dcd74433710d47127cbe29 (diff) | |
| download | vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.gz vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.bz2 vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/enterleave.h | 8 | ||||
| -rw-r--r-- | xorg-server/dix/events.c | 2 | ||||
| -rw-r--r-- | xorg-server/dix/ptrveloc.c | 3 |
3 files changed, 2 insertions, 11 deletions
diff --git a/xorg-server/dix/enterleave.h b/xorg-server/dix/enterleave.h index c1729f8da..c937c0e7f 100644 --- a/xorg-server/dix/enterleave.h +++ b/xorg-server/dix/enterleave.h @@ -31,13 +31,12 @@ #ifndef ENTERLEAVE_H #define ENTERLEAVE_H +#include <dix.h> /* DoFocusEvents() */ + extern void DoEnterLeaveEvents(DeviceIntPtr pDev, int sourceid, WindowPtr fromWin, WindowPtr toWin, int mode); -extern void DoFocusEvents(DeviceIntPtr pDev, - WindowPtr fromWin, WindowPtr toWin, int mode); - extern void EnterLeaveEvent(DeviceIntPtr mouse, int type, int mode, int detail, WindowPtr pWin, Window child); @@ -61,9 +60,6 @@ extern void LeaveWindow(DeviceIntPtr dev); extern void CoreFocusEvent(DeviceIntPtr kbd, int type, int mode, int detail, WindowPtr pWin); -extern void DeviceFocusEvent(DeviceIntPtr kbd, - int type, int mode, int detail, WindowPtr pWin); - extern void SetFocusIn(DeviceIntPtr kbd, WindowPtr win); extern void SetFocusOut(DeviceIntPtr dev); diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index 6d5f67586..47c61d42b 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -349,8 +349,6 @@ IsFloating(DeviceIntPtr dev) */ extern int lastEvent; -extern int DeviceMotionNotify; - #define CantBeFiltered NoEventMask /** * Event masks for each event type. diff --git a/xorg-server/dix/ptrveloc.c b/xorg-server/dix/ptrveloc.c index fb5f19d69..8c266af8c 100644 --- a/xorg-server/dix/ptrveloc.c +++ b/xorg-server/dix/ptrveloc.c @@ -70,10 +70,7 @@ #endif /* fwds */ -int - SetAccelerationProfile(DeviceVelocityPtr vel, int profile_num); static double - SimpleSmoothProfile(DeviceIntPtr dev, DeviceVelocityPtr vel, double velocity, double threshold, double acc); static PointerAccelerationProfileFunc |