diff options
Diffstat (limited to 'xorg-server/hw/xwin/winmouse.c')
| -rw-r--r-- | xorg-server/hw/xwin/winmouse.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c index bbe21cba6..6b293f0ab 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" @@ -45,18 +52,6 @@ static CARD8 const *g_winMouseButtonMap = NULL; /* - * Local prototypes - */ - -static void - winMouseCtrl(DeviceIntPtr pDevice, PtrCtrl * pCtrl); - -static void -winMouseCtrl(DeviceIntPtr pDevice, PtrCtrl * pCtrl) -{ -} - -/* * See Porting Layer Definition - p. 18 * This is known as a DeviceProc */ @@ -75,7 +70,7 @@ winMouseProc(DeviceIntPtr pDeviceInt, int iState) case DEVICE_INIT: /* Get number of mouse buttons */ lngMouseButtons = GetSystemMetrics(SM_CMOUSEBUTTONS); - winMsg(X_PROBED, "%d mouse buttons found\n", lngMouseButtons); + winDebug("%d mouse buttons found\n", lngMouseButtons); /* Mapping of windows events to X events: * LEFT:1 MIDDLE:2 RIGHT:3 @@ -122,7 +117,7 @@ winMouseProc(DeviceIntPtr pDeviceInt, int iState) map, lngMouseButtons + lngWheelEvents, btn_labels, - winMouseCtrl, + (PtrCtrlProcPtr)NoopDDA, GetMotionHistorySize(), 2, axes_labels); free(map); @@ -231,10 +226,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 } /* |