diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-11 12:54:46 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-11 12:54:46 +1000 |
commit | 88cb61e1e55c54982b90e2a77465faaac6a0ba89 (patch) | |
tree | 0798bc507e7b088e2bdeadd29888a4bd092b036d /hw/xwin/winmouse.c | |
parent | 19f43836d1006d253391926e880b14ed2e7a0cf8 (diff) | |
parent | 4ed4915bc0fbe9b4419ca4a0d4e43c2fee032ae9 (diff) |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-api
Conflicts:
dix/getevents.c
hw/xfree86/common/xf86Xinput.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/xwin/winmouse.c')
-rw-r--r-- | hw/xwin/winmouse.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c index e645d7ebc..da1d5a9e7 100644 --- a/hw/xwin/winmouse.c +++ b/hw/xwin/winmouse.c @@ -36,14 +36,12 @@ #endif #include "win.h" -#if defined(XFree86Server) #include "inputstr.h" #include "exevents.h" /* for button/axes labels */ #include "xserver-properties.h" /* Peek the internal button mapping */ static CARD8 const *g_winMouseButtonMap = NULL; -#endif /* @@ -123,9 +121,7 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState) free(map); free(btn_labels); -#if defined(XFree86Server) g_winMouseButtonMap = pDeviceInt->button->map; -#endif break; case DEVICE_ON: @@ -133,9 +129,8 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState) break; case DEVICE_CLOSE: -#if defined(XFree86Server) g_winMouseButtonMap = NULL; -#endif + case DEVICE_OFF: pDevice->on = FALSE; break; @@ -242,10 +237,8 @@ winMouseButtonsSendEvent (int iEventType, int iButton) int i, nevents; ValuatorMask mask; -#if defined(XFree86Server) if (g_winMouseButtonMap) iButton = g_winMouseButtonMap[iButton]; -#endif valuator_mask_zero(&mask); GetEventList(&events); @@ -253,7 +246,7 @@ winMouseButtonsSendEvent (int iEventType, int iButton) POINTER_RELATIVE, &mask); for (i = 0; i < nevents; i++) - mieqEnqueue(g_pwinPointer, events[i].event); + mieqEnqueue(g_pwinPointer, (InternalEvent*)events[i].event); #if CYGDEBUG ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d, nEvents %d\n", @@ -388,5 +381,5 @@ void winEnqueueMotion(int x, int y) POINTER_ABSOLUTE | POINTER_SCREEN, &mask); for (i = 0; i < nevents; i++) - mieqEnqueue(g_pwinPointer, events[i].event); + mieqEnqueue(g_pwinPointer, (InternalEvent*)events[i].event); } |