diff options
Diffstat (limited to 'xorg-server/hw/xwin/winmouse.c')
| -rw-r--r-- | xorg-server/hw/xwin/winmouse.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c index 752334a31..efd1fb649 100644 --- a/xorg-server/hw/xwin/winmouse.c +++ b/xorg-server/hw/xwin/winmouse.c @@ -36,6 +36,13 @@ #endif #include "win.h" +#ifdef XKB +#ifndef XKB_IN_SERVER +#define XKB_IN_SERVER +#endif +#include <xkbsrv.h> +#endif + #include "inputstr.h" #include "exevents.h" /* for button/axes labels */ #include "xserver-properties.h" @@ -89,7 +96,7 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState) */ if (lngMouseButtons < 3) lngMouseButtons = 3; - winMsg(X_PROBED, "%d mouse buttons found\n", lngMouseButtons); + winDebug("%d mouse buttons found\n", lngMouseButtons); /* allocate memory: * number of buttons + 2x mouse wheel event + 1 extra (offset for map) @@ -243,10 +250,8 @@ winMouseButtonsSendEvent (int iEventType, int iButton) QueuePointerEvents(g_pwinPointer, iEventType, iButton, POINTER_RELATIVE, &mask); -#if CYGDEBUG - ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n", + winDebug("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n", iEventType, iButton); -#endif } @@ -363,8 +368,10 @@ void winEnqueueMotion(int x, int y) { int valuators[2]; ValuatorMask mask; + double dbl_x=(double)x; + double dbl_y=(double)y; - miPointerSetPosition(g_pwinPointer, POINTER_RELATIVE, &x, &y); + miPointerSetPosition(g_pwinPointer, Absolute, &dbl_x, &dbl_y); valuators[0] = x; valuators[1] = y; |