diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-29 15:02:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-29 15:02:10 +0200 |
| commit | 1ccf18dc09e288ddf937aa890b50c8d0a9df4319 (patch) | |
| tree | a08f093a56109dd213582d26534b7ead87e86695 /xorg-server/dix/events.c | |
| parent | 741ef6e15af761d44ca0d8d54f6b99c33dd1b6bd (diff) | |
| download | vcxsrv-1ccf18dc09e288ddf937aa890b50c8d0a9df4319.tar.gz vcxsrv-1ccf18dc09e288ddf937aa890b50c8d0a9df4319.tar.bz2 vcxsrv-1ccf18dc09e288ddf937aa890b50c8d0a9df4319.zip | |
libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011
Diffstat (limited to 'xorg-server/dix/events.c')
| -rw-r--r-- | xorg-server/dix/events.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index 14f6f909e..b60c29952 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -112,6 +112,7 @@ Equipment Corporation. #include <X11/Xproto.h> #include "windowstr.h" #include "inputstr.h" +#include "inpututils.h" #include "scrnintstr.h" #include "cursorstr.h" @@ -2195,7 +2196,7 @@ DeliverEventsToWindow(DeviceIntPtr pDev, WindowPtr pWin, xEvent */ if (!grab && ActivateImplicitGrab(pDev, client, pWin, pEvents, deliveryMask)) /* grab activated */; - else if ((type == MotionNotify)) + else if (type == MotionNotify) pDev->valuator->motionHintWindow = pWin; else if (type == DeviceMotionNotify || type == DeviceButtonPress) CheckDeviceGrabAndHintWindow (pWin, type, @@ -2832,7 +2833,7 @@ CheckMotion(DeviceEvent *ev, DeviceIntPtr pDev) WindowPtr prevSpriteWin, newSpriteWin; SpritePtr pSprite = pDev->spriteInfo->sprite; - verify_internal_event(ev); + verify_internal_event((InternalEvent *)ev); prevSpriteWin = pSprite->win; @@ -5906,7 +5907,7 @@ PickPointer(ClientPtr client) if (!client->clientPtr) { - DeviceIntPtr it = inputInfo.devices; + it = inputInfo.devices; while (it) { if (IsMaster(it) && it->spriteInfo->spriteOwner) |