hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-11-01 03:03:58 +00:00
Code Issues Projects Releases Wiki Activity

input: instead of lastx/y, use a last.valuators[] array on the device.

Browse source 
During GetPointerEvents (and others), we need to access the last coordinates
posted for this device from the driver (not as posted to the client!). Lastx/y
is ok if we only have two axes, but with more complex devices we also need to
transition between all other axes.

ABI break, recompile your input drivers.
This commit is contained in:
Peter Hutterer 2008-05-23 11:51:53 +09:30
commit 6c9e9f8a40
7 changed files with 49 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hw/xfree86/common/xf86Xinput.c
View file

@ -505,8 +505,6 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
* convenient functions to post events
*/
#define MAX_VALUATORS 36 /* XXX from comment in dix/getevents.c */
_X_EXPORT void
xf86PostMotionEvent(DeviceIntPtr device,
int is_absolute,
@ -566,14 +564,14 @@ xf86PostMotionEventP(DeviceIntPtr device,
{
dx = valuators[0];
if (is_absolute)
dx -= device->lastx;
dx -= device->last.valuators[0];
}
if (first_valuator == 1 || num_valuators >= 2)
{
dy = valuators[1 - first_valuator];
if (is_absolute)
dy -= device->lasty;
dy -= device->last.valuators[1];
}
if (DGAStealMotionEvent(device, index, dx, dy))
@ -833,11 +831,11 @@ xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum)
{
if (axnum == 0) {
dev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2;
dev->lastx = dev->valuator->axisVal[0];
dev->last.valuators[0] = dev->valuator->axisVal[0];
}
else if (axnum == 1) {
dev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2;
dev->lasty = dev->valuator->axisVal[1];
dev->last.valuators[1] = dev->valuator->axisVal[1];
}
}