diff options
| author | Zephaniah E. Hull <warp@agamemnon.b5> | 2006-10-21 04:26:14 -0400 |
|---|---|---|
| committer | Zephaniah E. Hull <warp@agamemnon.b5> | 2006-10-21 04:26:14 -0400 |
| commit | e26a494f417c3c700636ee68892c3015b2e0f27a (patch) | |
| tree | 05c7c00ca9815a3b3125d406dfe8f912071fc09e /hw/xfree86/common/xf86Xinput.c | |
| parent | 736b0d5078597abbda80444deef852879260af90 (diff) | |
| parent | aeba855b07832354f59678e20cc29a085e42bd99 (diff) | |
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver
Diffstat (limited to 'hw/xfree86/common/xf86Xinput.c')
| -rw-r--r-- | hw/xfree86/common/xf86Xinput.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 8a5d5b30a..e1fa9c116 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -657,20 +657,7 @@ xf86PostMotionEvent(DeviceIntPtr device, valuators); for (i = 0; i < nevents; i++) - mieqEnqueue(xf86Events + i); - -#if 0 - if (HAS_MOTION_HISTORY(local)) { - buff = ((char *)local->motion_history + - (sizeof(INT32) * local->dev->valuator->numAxes + sizeof(Time)) * local->last); - } - - if (HAS_MOTION_HISTORY(local)) { - local->last = (local->last + 1) % device->valuator->numMotionEvents; - if (local->last == local->first) - local->first = (local->first + 1) % device->valuator->numMotionEvents; - } -#endif + mieqEnqueue(device, xf86Events + i); } _X_EXPORT void @@ -796,7 +783,7 @@ xf86PostButtonEvent(DeviceIntPtr device, first_valuator, num_valuators, valuators); for (i = 0; i < nevents; i++) - mieqEnqueue(xf86Events + i); + mieqEnqueue(device, xf86Events + i); } _X_EXPORT void @@ -840,7 +827,7 @@ xf86PostKeyEvent(DeviceIntPtr device, } for (i = 0; i < nevents; i++) - mieqEnqueue(xf86Events + i); + mieqEnqueue(device, xf86Events + i); } _X_EXPORT void @@ -859,7 +846,7 @@ xf86PostKeyboardEvent(DeviceIntPtr device, is_down ? KeyPress : KeyRelease, key_code); for (i = 0; i < nevents; i++) - mieqEnqueue(xf86Events + i); + mieqEnqueue(device, xf86Events + i); } /* |