diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-15 15:02:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-15 15:02:37 +0200 |
| commit | 062c45ff0df6a52080dcd74433710d47127cbe29 (patch) | |
| tree | b038a5498555dfc9adf695c49d185f9414056931 /xorg-server/dix | |
| parent | 1a71b50696cc230cd055905a5f9fdbd3fa7c89af (diff) | |
| download | vcxsrv-062c45ff0df6a52080dcd74433710d47127cbe29.tar.gz vcxsrv-062c45ff0df6a52080dcd74433710d47127cbe29.tar.bz2 vcxsrv-062c45ff0df6a52080dcd74433710d47127cbe29.zip | |
xserver mesa git update 15 May 2012
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 9496b6f19..83ae5c965 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 acbb479c1..a788575ca 100644 --- a/xorg-server/dix/ptrveloc.c +++ b/xorg-server/dix/ptrveloc.c @@ -61,10 +61,7 @@ ****************************************************************************/ /* fwds */ -int - SetAccelerationProfile(DeviceVelocityPtr vel, int profile_num); static double - SimpleSmoothProfile(DeviceIntPtr dev, DeviceVelocityPtr vel, double velocity, double threshold, double acc); static PointerAccelerationProfileFunc |